summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-10 12:16:40 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-10 12:16:40 +0100
commit6641ee0944cbe2397962b74729373958f63cfab8 (patch)
tree3ec164d8061268a2f586d63a47716b07f46e134d /core/src
parent6154e6415ecff8949c38e0eb655da01362b9e550 (diff)
downloadRustAndDust-6641ee0944cbe2397962b74729373958f63cfab8.zip
RustAndDust-6641ee0944cbe2397962b74729373958f63cfab8.tar.gz
BattleCommon: init is one turn, only call map.turnDone() when all is done
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index fbf088d..406e8a1 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -108,17 +108,14 @@ public abstract class BattleCommon implements Battle
this.currentPlayer = players[0];
setupPlayer();
- map.actionDone();
- map.turnDone();
currentPlayer.turnEnd();
this.currentPlayer = players[1];
setupPlayer();
- map.actionDone();
- map.turnDone();
currentPlayer.turnEnd();
this.currentPlayer = players[0];
+ map.turnDone();
}
@Override