summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java7
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StatePromote.java4
2 files changed, 3 insertions, 8 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 970e750..7682893 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -196,13 +196,6 @@ public abstract class Map extends Board
pawn.reset();
}
- public void promote(Pawn pawn, Pawn with)
- {
- removePawn(pawn);
- setPawnOnto(with, pawn.getTile(), pawn.getOrientation());
- activatedPawns.add(with);
- }
-
public int movePawn(Pawn pawn, Orientation o)
{
possiblePaths.orientation = o;
diff --git a/core/src/ch/asynk/tankontank/game/states/StatePromote.java b/core/src/ch/asynk/tankontank/game/states/StatePromote.java
index 70cb875..cf628d9 100644
--- a/core/src/ch/asynk/tankontank/game/states/StatePromote.java
+++ b/core/src/ch/asynk/tankontank/game/states/StatePromote.java
@@ -10,8 +10,10 @@ public class StatePromote extends StateCommon
ctrl.hud.actionButtons.hide();
Unit unit = ctrl.player.promote(selectedUnit);
if (unit != null) {
+ // TODO this must burn 1 AP down !!!!!
ctrl.hud.notify(unit + " has been promoted");
- map.promote(selectedUnit, unit);
+ selectedUnit.promote();
+ unit.degrade();
}
done();
}