From 0fbe2d7d1dd29762d48c06e7908df6d0b9029cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Sun, 23 Nov 2014 22:19:34 +0100
Subject: Map: leaveBoard: removePawn and if entryMove: revert objectives, and
 reset unit

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

diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 537a48f..398ded0 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -214,8 +214,11 @@ public abstract class Map extends Board
     public void leaveBoard(Unit unit)
     {
         Hex hex = unit.getHex();
-        if (removePawn(unit) == 0)
-            objectives.unclaim(hex);
+        if (unit.movement.entryMove) {
+            objectives.revert();
+            unit.reset();
+        }
+        removePawn(unit);
         activatedUnits.add(unit);
     }
 
-- 
cgit v1.1-2-g2b99