From 8686fef96a6c2bacf9d25829bf813576ec16680b Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 4 Mar 2017 04:23:19 +0800
Subject: [PATCH] enstacking of card during combat

during combat damage, the cards will not move/enstack so we can see what
happened to those creatures...
---
 projects/mtg/src/GuiPlay.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp
index df3ff46e2..1a1c581f8 100644
--- a/projects/mtg/src/GuiPlay.cpp
+++ b/projects/mtg/src/GuiPlay.cpp
@@ -123,6 +123,8 @@ void GuiPlay::BattleField::reset(float x, float y)
 }
 void GuiPlay::BattleField::EnstackAttacker(CardView* card)
 {
+    if(card->card->getObserver() && card->card->getObserver()->getCurrentGamePhase() == MTG_PHASE_COMBATDAMAGE)
+        return;
     //card->x = CARD_WIDTH + 20 + (currentAttacker * (HORZWIDTH) / (attackers+1));
     card->x = x + (CARD_WIDTH/2.5f) + baseX;
     if (attackers+1 < 8)
@@ -138,6 +140,8 @@ void GuiPlay::BattleField::EnstackAttacker(CardView* card)
 }
 void GuiPlay::BattleField::EnstackBlocker(CardView* card)
 {
+    if(card->card->getObserver() && card->card->getObserver()->getCurrentGamePhase() == MTG_PHASE_COMBATDAMAGE)
+        return;
     MTGCardInstance * c = card->card;
     if (!c)
         return;