From 9293e6baae588cf8ce4d9c590c0ebd94ecb0b960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Tue, 20 Jan 2015 10:28:47 +0100
Subject: Map: add turnDone(), call turnDone() and actionDone() from Ctrl

---
 core/src/ch/asynk/tankontank/game/Ctrl.java | 2 ++
 core/src/ch/asynk/tankontank/game/Map.java  | 5 +++++
 2 files changed, 7 insertions(+)

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();
-- 
cgit v1.1-2-g2b99