summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-01-20 10:28:47 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-01-20 10:28:47 +0100
commit9293e6baae588cf8ce4d9c590c0ebd94ecb0b960 (patch)
tree794360911b3e3cfbea1d7c9e31307753ac995929 /core/src/ch/asynk/tankontank
parent38573f8b055e10497b75356cbee35fd7df75e90f (diff)
downloadRustAndDust-9293e6baae588cf8ce4d9c590c0ebd94ecb0b960.zip
RustAndDust-9293e6baae588cf8ce4d9c590c0ebd94ecb0b960.tar.gz
Map: add turnDone(), call turnDone() and actionDone() from Ctrl
Diffstat (limited to 'core/src/ch/asynk/tankontank')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java5
2 files changed, 7 insertions, 0 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 79008f4..8a3fdb5 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -156,6 +156,7 @@ public class Ctrl implements Disposable
private void turnDone()
{
+ map.turnDone();
endPlayerTurn();
player = battle.getPlayer();
opponent = battle.opponent(player);
@@ -185,6 +186,7 @@ public class Ctrl implements Disposable
private StateType deploymentDone()
{
+ map.actionDone();
return this.state.execute();
}
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 200ca16..76369af 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -297,6 +297,11 @@ public abstract class Map extends Board
// STATES ENTRY ->
+ public void turnDone()
+ {
+ objectives.forget();
+ }
+
public void actionDone()
{
objectives.forget();