summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank/game/states
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-02-20 00:58:27 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-02-20 00:58:27 +0100
commit69dee7fd17f76397daa6e74eb6d78110aaa35201 (patch)
tree90820cb1ecd233f2d49d98308b1857768520a71d /core/src/ch/asynk/tankontank/game/states
parentbd29a669b211112f2aba4acc8971df4d18f51032 (diff)
downloadRustAndDust-69dee7fd17f76397daa6e74eb6d78110aaa35201.zip
RustAndDust-69dee7fd17f76397daa6e74eb6d78110aaa35201.tar.gz
Board,Map,Ctrl: move annimation count to Board
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/states')
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateBreak.java1
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateEngage.java1
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateMove.java1
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StatePromote.java1
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateRotate.java1
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateWithdraw.java1
6 files changed, 0 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateBreak.java b/core/src/ch/asynk/tankontank/game/states/StateBreak.java
index 31b6315..9b87c23 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateBreak.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateBreak.java
@@ -83,7 +83,6 @@ public class StateBreak extends StateCommon
if (map.pathBuilder.build(to) == 1) {
map.pathBuilder.orientation = o;
map.moveUnit(activeUnit);
- ctrl.setAnimationCount(1);
ctrl.setAfterAnimationState(StateType.DONE);
} else
TankOnTank.debug("That's very wrong there should be only one path");
diff --git a/core/src/ch/asynk/tankontank/game/states/StateEngage.java b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
index 048dbef..865907e 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateEngage.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
@@ -64,7 +64,6 @@ public class StateEngage extends StateCommon
}
activeUnit.showTarget();
- ctrl.setAnimationCount(map.activatedUnits.size());
ctrl.setAfterAnimationState(nextState);
return StateType.ANIMATION;
}
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java
index cce19a6..9a8195d 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateMove.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java
@@ -76,7 +76,6 @@ public class StateMove extends StateCommon
int n = map.activatedUnits.size();
if (n == 0)
return StateType.ABORT;
- ctrl.setAnimationCount(n);
map.revertMoves();
return StateType.ANIMATION;
}
diff --git a/core/src/ch/asynk/tankontank/game/states/StatePromote.java b/core/src/ch/asynk/tankontank/game/states/StatePromote.java
index 81d6d7e..9f327e7 100644
--- a/core/src/ch/asynk/tankontank/game/states/StatePromote.java
+++ b/core/src/ch/asynk/tankontank/game/states/StatePromote.java
@@ -7,7 +7,6 @@ public class StatePromote extends StateCommon
@Override
public void enter(StateType prevState)
{
- ctrl.setAnimationCount(1);
ctrl.setAfterAnimationState(StateType.DONE);
ctrl.setState(StateType.ANIMATION);
map.promoteUnit(selectedUnit);
diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
index 6b60dfb..d297840 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
@@ -73,7 +73,6 @@ public class StateRotate extends StateCommon
if (map.moveUnit(activeUnit) > 0)
whenDone = StateType.MOVE;
- ctrl.setAnimationCount(1);
ctrl.setAfterAnimationState(whenDone);
return StateType.ANIMATION;
}
diff --git a/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java b/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java
index 43c38cc..87c33b8 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java
@@ -29,7 +29,6 @@ public class StateWithdraw extends StateCommon
if (activeUnit == null)
activeUnit = selectedUnit;
- ctrl.setAnimationCount(1);
ctrl.setAfterAnimationState(withdraw(activeUnit));
return StateType.ANIMATION;
}