From db03f429fd1dd171e4b4c78b7db92717a04be8c4 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Sat, 2 Oct 2021 15:08:30 +0200
Subject: Fixed 'not' keyword usage as identifier

---
 Stars45/Campaign.cpp     |  6 +++---
 Stars45/CombatAction.cpp |  6 +++---
 Stars45/CombatAction.h   | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'Stars45')

diff --git a/Stars45/Campaign.cpp b/Stars45/Campaign.cpp
index 499e36a..9a88e5d 100644
--- a/Stars45/Campaign.cpp
+++ b/Stars45/Campaign.cpp
@@ -848,7 +848,7 @@ Campaign::ParseAction(TermStruct* val, const char* filename)
 
                     int  act  = 0;
                     int  stat = CombatAction::COMPLETE;
-                    bool not  = false;
+                    bool _not = false;
 
                     Combatant*  c1    = 0;
                     Combatant*  c2    = 0;
@@ -870,7 +870,7 @@ Campaign::ParseAction(TermStruct* val, const char* filename)
                                 stat = CombatAction::StatusFromName(txt);
                             }
                             else if (pdef2->name()->value() == "not") {
-                                GetDefBool(not, pdef2, filename);
+                                GetDefBool(_not, pdef2, filename);
                             }
 
                             else if (pdef2->name()->value() == "c1") {
@@ -913,7 +913,7 @@ Campaign::ParseAction(TermStruct* val, const char* filename)
                     }
 
                     if (act)
-                    action->AddRequirement(act, stat, not);
+                    action->AddRequirement(act, stat, _not);
 
                     else if (gtype)
                     action->AddRequirement(c1, gtype, gid, comp, score, intel);
diff --git a/Stars45/CombatAction.cpp b/Stars45/CombatAction.cpp
index 15d17a6..ed2fba7 100644
--- a/Stars45/CombatAction.cpp
+++ b/Stars45/CombatAction.cpp
@@ -108,7 +108,7 @@ CombatAction::IsAvailable() const
                     CombatAction* a = action.value();
 
                     if (a->Identity() == r->action) {
-                        if (r->not) {
+                        if (r->_not) {
                             if (a->Status() == r->stat)
                             return false;
                         }
@@ -230,9 +230,9 @@ CombatAction::FailAction()
 // +----------------------------------------------------------------------+
 
 void
-CombatAction::AddRequirement(int action, int stat, bool not)
+CombatAction::AddRequirement(int action, int stat, bool _not)
 {
-    requirements.append(new(__FILE__,__LINE__) CombatActionReq(action, stat, not));
+    requirements.append(new(__FILE__,__LINE__) CombatActionReq(action, stat, _not));
 }
 
 void
diff --git a/Stars45/CombatAction.h b/Stars45/CombatAction.h
index c247d06..b95fcf0 100644
--- a/Stars45/CombatAction.h
+++ b/Stars45/CombatAction.h
@@ -87,7 +87,7 @@ public:
     bool                 IsAvailable()  const;
     void                 FireAction();
     void                 FailAction();
-    void                 AddRequirement(int action, int stat, bool not = false);
+    void                 AddRequirement(int action, int stat, bool _not = false);
     void                 AddRequirement(Combatant* c1, Combatant* c2, int comp, int score);
     void                 AddRequirement(Combatant* c1, int group_type, int group_id, int comp, int score, int intel=0);
     static int           TypeFromName(const char* n);
@@ -200,21 +200,21 @@ public:
     };
 
     CombatActionReq(int a, int s, bool n = false)
-    : action(a), stat(s), not(n), c1(0), c2(0), comp(0), score(0), intel(0) { }
+    : action(a), stat(s), _not(n), c1(0), c2(0), comp(0), score(0), intel(0) { }
 
     CombatActionReq(Combatant* a1, Combatant* a2, int comparison, int value)
-    : action(0), stat(0), not(0), c1(a1), c2(a2), group_type(0), group_id(0),
+    : action(0), stat(0), _not(0), c1(a1), c2(a2), group_type(0), group_id(0),
     comp(comparison), score(value), intel(0) { }
 
     CombatActionReq(Combatant* a1, int gtype, int gid, int comparison, int value, int intel_level=0)
-    : action(0), stat(0), not(0), c1(a1), c2(0), group_type(gtype), group_id(gid),
+    : action(0), stat(0), _not(0), c1(a1), c2(0), group_type(gtype), group_id(gid),
     comp(comparison), score(value), intel(intel_level) { }
 
     static int CompFromName(const char* sym);
 
     int   action;
     int   stat;
-    bool  not;
+    bool  _not;
 
     Combatant*  c1;
     Combatant*  c2;
-- 
cgit v1.1