summaryrefslogtreecommitdiffhomepage
path: root/Stars45/CombatAction.h
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/CombatAction.h')
-rw-r--r--Stars45/CombatAction.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Stars45/CombatAction.h b/Stars45/CombatAction.h
index c247d06..a2af69d 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;
@@ -225,5 +225,5 @@ public:
int group_id;
};
-#endif CombatAction_h
+#endif // CombatAction_h