Map: add turnDone(), call turnDone() and actionDone() from Ctrl

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();