diff options
| author | Aki <please@ignore.pl> | 2021-10-02 15:08:30 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2021-10-02 15:08:30 +0200 |
| commit | db03f429fd1dd171e4b4c78b7db92717a04be8c4 (patch) | |
| tree | d339b4b95e69e3d53f728c5e4c48e8fded75c5d9 /Stars45/Campaign.cpp | |
| parent | 5f5aa47b4260d4e688acdd85558baedfc99da752 (diff) | |
| download | starshatter-db03f429fd1dd171e4b4c78b7db92717a04be8c4.zip starshatter-db03f429fd1dd171e4b4c78b7db92717a04be8c4.tar.gz starshatter-db03f429fd1dd171e4b4c78b7db92717a04be8c4.tar.bz2 | |
Fixed 'not' keyword usage as identifier
Diffstat (limited to 'Stars45/Campaign.cpp')
| -rw-r--r-- | Stars45/Campaign.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |