Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show large images on grid deck view user option

Browse Source 
also forced border targets and target source
This commit is contained in:
Anthony Calosa
2017-03-05 19:43:49 +08:00
parent f205de7205
commit 4bf5943ac5
9 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GuiPlay.cpp
+2 -2
View File
@@ -123,7 +123,7 @@ 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)
if(card->card->getObserver() && (card->card->getObserver()->getCurrentGamePhase() >= MTG_PHASE_COMBATDAMAGE) && (card->card->getObserver()->getCurrentGamePhase() < MTG_PHASE_ENDOFTURN))
return;
//card->x = CARD_WIDTH + 20 + (currentAttacker * (HORZWIDTH) / (attackers+1));
card->x = x + (CARD_WIDTH/2.5f) + baseX;
@@ -140,7 +140,7 @@ void GuiPlay::BattleField::EnstackAttacker(CardView* card)
}
void GuiPlay::BattleField::EnstackBlocker(CardView* card)
{
if(card->card->getObserver() && card->card->getObserver()->getCurrentGamePhase() == MTG_PHASE_COMBATDAMAGE)
if(card->card->getObserver() && (card->card->getObserver()->getCurrentGamePhase() >= MTG_PHASE_COMBATDAMAGE) && (card->card->getObserver()->getCurrentGamePhase() < MTG_PHASE_ENDOFTURN))
return;
MTGCardInstance * c = card->card;
if (!c)