summaryrefslogtreecommitdiffhomepage
path: root/Stars45/CombatAction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/CombatAction.cpp')
-rw-r--r--Stars45/CombatAction.cpp6
1 files changed, 3 insertions, 3 deletions
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