From ca41a6c5c9e2f754daa81052d00773f1cad29acc Mon Sep 17 00:00:00 2001
From: johns <>
Date: Wed, 14 Mar 2001 18:00:43 +0000
Subject: [PATCH] Removed not needed unit->SubAction|=2;.
---
src/action/action_still.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/action/action_still.cpp b/src/action/action_still.cpp
index a056c9bab..3d04e6a17 100644
--- a/src/action/action_still.cpp
+++ b/src/action/action_still.cpp
@@ -180,6 +180,7 @@ global void ActionStillGeneric(Unit* unit,int ground)
unit->SavedOrder.Y=unit->Y;
unit->SavedOrder.Goal=NoUnitP;
ResetPath(unit->SavedOrder);
+ // FIXME: next isn't used: unit->SubAction|=2;
#else
unit->SavedCommand.Action=UnitActionAttack;
unit->SavedCommand.Data.Move.Range=0;
@@ -187,8 +188,8 @@ global void ActionStillGeneric(Unit* unit,int ground)
unit->SavedCommand.Data.Move.DY=unit->Y;
unit->SavedCommand.Data.Move.Goal=NoUnitP;
ResetPath(unit->SavedCommand);
-#endif
unit->SubAction|=2;
+#endif
}
} else if( (goal=AttackUnitsInRange(unit)) ) {
DebugLevel3Fn(" %Zd #%d\n",UnitNumber(goal),goal->Refs);
@@ -229,7 +230,7 @@ global void ActionStillGeneric(Unit* unit,int ground)
#endif
goal->Refs++;
unit->State=0;
- unit->SubAction=1;
+ unit->SubAction=1; // Mark attacking.
if( !type->Tower ) {
UnitHeadingFromDeltaXY(unit,goal->X-unit->X
,goal->Y-unit->Y);
@@ -262,7 +263,7 @@ global void ActionStillGeneric(Unit* unit,int ground)
unit->Command.Data.Move.Goal=NoUnitP;
#endif
}
- unit->SubAction=unit->State=0;
+ unit->SubAction=unit->State=0; // No attacking, restart
}
//