diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-28 10:59:48 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-28 10:59:48 +0100 |
| commit | d4a7c7bb113505bd38a6bca7d74cba5de3e94d69 (patch) | |
| tree | 070f11964cb89905df4eb907956dfe9a69ad41d2 /core/src/ch/asynk/tankontank/game/states | |
| parent | a0ed984bfdad195e3ee1b32292a58ba1586d42b5 (diff) | |
| download | RustAndDust-d4a7c7bb113505bd38a6bca7d74cba5de3e94d69.zip RustAndDust-d4a7c7bb113505bd38a6bca7d74cba5de3e94d69.tar.gz | |
Map: replace ...Count() with direct calls
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/states')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateMove.java | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateRotate.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index e959376..08795c8 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java @@ -9,7 +9,7 @@ public class StateMove extends StateCommon public void enter(boolean fromSelect) { map.possiblePaths.clear(); - ctrl.hud.show(false, true, true, false, ((map.activablePawnsCount() + map.activatedPawnsCount()) > 1), ctrl.cfg.canCancel); + ctrl.hud.show(false, true, true, false, ((map.activablePawns.size() + map.activatedPawns.size()) > 1), ctrl.cfg.canCancel); ctrl.hud.moveBtn.setOn(); if (fromSelect) { @@ -59,7 +59,7 @@ public class StateMove extends StateCommon @Override public void touchUp() { - int s = map.possiblePathsSize(); + int s = map.possiblePaths.size(); if (map.isInPossibleMoveAssists(upHex) || (selectedPawn.canMove() && (selectedHex == upHex))) { if(upHex != from) @@ -82,7 +82,7 @@ public class StateMove extends StateCommon public void abort() { hideAssists(); - ctrl.setAnimationCount(map.activatedPawnsCount()); + ctrl.setAnimationCount(map.activatedPawns.size()); map.revertMoves(); super.abort(); } @@ -91,7 +91,7 @@ public class StateMove extends StateCommon public void done() { hideAssists(); - if (selectedPawn.canMove() && (map.activatedPawnsCount() > 0)) + if (selectedPawn.canMove() && (map.activatedPawns.size() > 0)) selectedPawn.move(0); super.done(); } diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java index e127bda..7bb3f28 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java +++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java @@ -74,7 +74,7 @@ public class StateRotate extends StateCommon public void abort() { ctrl.hud.hide(); - if (map.activatedPawnsCount() == 0) { + if (map.activatedPawns.size() == 0) { hideAssists(); super.abort(); } else { @@ -86,7 +86,7 @@ public class StateRotate extends StateCommon public void done() { doRotation(o); - if (selectedPawn.canMove() && (map.activatedPawnsCount() > 0)) + if (selectedPawn.canMove() && (map.activatedPawns.size() > 0)) selectedPawn.move(0); super.done(); } |