State ATTACK -> ENGAGE

2 files changed, 7 insertions, 7 deletions

diff --git a/core/src/ch/asynk/tankontank/game/states/StateAttack.java b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
index 97efd87..c157a69 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateAttack.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
@@ -5,14 +5,14 @@ import ch.asynk.tankontank.game.hud.ActionButtons.Buttons;
 
 import ch.asynk.tankontank.TankOnTank;
 
-public class StateAttack extends StateCommon
+public class StateEngage extends StateCommon
 {
     @Override
     public void enter(StateType prevState)
     {
         map.possibleTargets.clear();
-        ctrl.hud.actionButtons.show(Buttons.ATTACK.b | ((ctrl.cfg.canCancel) ? Buttons.ABORT.b : 0));
-        ctrl.hud.actionButtons.setOn(Buttons.ATTACK);
+        ctrl.hud.actionButtons.show(Buttons.ENGAGE.b | ((ctrl.cfg.canCancel) ? Buttons.ABORT.b : 0));
+        ctrl.hud.actionButtons.setOn(Buttons.ENGAGE);
 
         // activeUnit is the target
         if (prevState == StateType.SELECT) {
@@ -87,14 +87,14 @@ public class StateAttack extends StateCommon
 
         // activeUnit is the target
         if ((activeUnit == null) && map.possibleTargets.contains(unit)) {
-            ctrl.hud.notify("Attack " + unit);
+            ctrl.hud.notify("Engage " + unit);
             map.hidePossibleTargets();
             to = upHex;
             activeUnit = unit;
             activeUnit.showTarget();
             map.collectAttackAssists(selectedUnit, activeUnit, ctrl.player.unitIterator());
             map.showAttackAssists();
-            ctrl.hud.actionButtons.show(Buttons.ATTACK.b | Buttons.DONE.b | ((ctrl.cfg.canCancel) ? Buttons.ABORT.b : 0));
+            ctrl.hud.actionButtons.show(Buttons.ENGAGE.b | Buttons.DONE.b | ((ctrl.cfg.canCancel) ? Buttons.ABORT.b : 0));
         }
 
         if ((activeUnit != null) && map.attackAssists.contains(unit)) {
diff --git a/core/src/ch/asynk/tankontank/game/states/StateSelect.java b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
index 82733fb..7e7059e 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateSelect.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
@@ -64,7 +64,7 @@ public class StateSelect extends StateCommon
             if (map.possibleTargets.contains(upHex.getUnit())) {
                 // quick fire
                 to = upHex;
-                ctrl.setState(StateType.ATTACK);
+                ctrl.setState(StateType.ENGAGE);
                 return;
             }
         }
@@ -87,7 +87,7 @@ public class StateSelect extends StateCommon
                 ((ctrl.player.canPromote(selectedUnit)) ? Buttons.PROMOTE.b : 0 ) |
                 ((selectedUnit.canMove()) ? Buttons.ROTATE.b : 0 ) |
                 ((moves > 0) ? Buttons.MOVE.b : 0 ) |
-                ((targets > 0) ? Buttons.ATTACK.b : 0)
+                ((targets > 0) ? Buttons.ENGAGE.b : 0)
                 );
         } else {
             ctrl.hud.actionButtons.hide();