Erwan

- fix armadillo cloak test + fix damage assignation step. A side effect is that when clicking on "Go", the game goes to the Damage step instead of going to the combat step. I believe this is acceptable but let me know if this feels weird when playing
- daily build

projects/mtg/bin/Res/test/armadillo_cloak.txt

@@ -19,9 +19,11 @@ next
 #blockers
 grizzly bears
 next
-#combat damage
+#combat damage ->Guicombat
 next
-combat end
+#combat damage assigned
+next
+#combat end
 [ASSERT]
 COMBATEND
 [PLAYER1]
@@ -29,5 +31,5 @@ inplay:Wildslayer Elves,Armadillo Cloak
 life:25
 [PLAYER2]
 graveyard:grizzly bears
-life:20
+life:17
 [END]

projects/mtg/bin/Res/test/generic/m10_blockers.txt

@@ -15,6 +15,8 @@ next
 #blockers order
 Drudge Skeletons
 next
+#combat damage ->Gui
+next
 #combat damage
 next
 #combat end

projects/mtg/bin/Res/test/generic/m10_blockers2.txt

@@ -17,6 +17,8 @@ next
 dragon engine
 Drudge Skeletons
 next
+#combat damage -> Gui
+next
 #combat damage
 next
 #combat end

projects/mtg/src/GuiCombat.cpp

@@ -81,8 +81,8 @@ void GuiCombat::validateDamage()
 {
   switch (step)
     {
-    case FIRST_STRIKE : resolve(); go->nextCombatStep(); break;
+    case FIRST_STRIKE : go->nextCombatStep(); break;
-    case DAMAGE       : resolve(); go->nextGamePhase(); break;
+    case DAMAGE       : go->nextGamePhase(); break;
     default: cout << "COMBAT : Cannot validate damage in this phase" << endl; break;
     }
 }
@@ -121,6 +121,7 @@ void GuiCombat::removeOne(DefenserDamaged* blocker, CombatStep step)
 }
 
 bool GuiCombat::clickOK(){
+  cursor_pos = NONE;
   switch (step)
     {
     case BLOCKERS         : assert(false); return false; // that should not happen