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

close library, exile, or graveyard after we "move" cards from it.

Browse Source
This commit is contained in:
zethfoxster
2016-07-06 22:04:59 -04:00
parent 8265253388
commit 066c40d9c1
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/mtg/include/GameObserver.h
View File

@@ -81,6 +81,7 @@ class GameObserver{
int oldGamePhase; int oldGamePhase;
TargetChooser * targetChooser; TargetChooser * targetChooser;
CardDisplay * OpenedDisplay; CardDisplay * OpenedDisplay;
GuiGameZone * guiOpenDisplay;
DuelLayers * mLayers; DuelLayers * mLayers;
ReplacementEffects *replacementEffects; ReplacementEffects *replacementEffects;
vector<Player *> players; //created outside vector<Player *> players; //created outside

1
projects/mtg/src/GameObserver.cpp
View File

@@ -98,6 +98,7 @@ GameObserver::GameObserver(WResourceManager *output, JGE* input)
cardWaitingForTargets = NULL; cardWaitingForTargets = NULL;
mExtraPayment = NULL; mExtraPayment = NULL;
OpenedDisplay = NULL; OpenedDisplay = NULL;
guiOpenDisplay = NULL;
gameOver = NULL; gameOver = NULL;
phaseRing = NULL; phaseRing = NULL;
replacementEffects = NEW ReplacementEffects(); replacementEffects = NEW ReplacementEffects();

2
projects/mtg/src/GuiStatic.cpp
View File

@@ -151,11 +151,13 @@ void GuiGameZone::toggleDisplay()
{ {
if (showCards) if (showCards)
{ {
cd->zone->owner->getObserver()->guiOpenDisplay = NULL;
showCards = 0; showCards = 0;
cd->zone->owner->getObserver()->OpenedDisplay = NULL; cd->zone->owner->getObserver()->OpenedDisplay = NULL;
} }
else if(!cd->zone->owner->getObserver()->OpenedDisplay)//one display at a time please. else if(!cd->zone->owner->getObserver()->OpenedDisplay)//one display at a time please.
{ {
cd->zone->owner->getObserver()->guiOpenDisplay = this;
showCards = 1; showCards = 1;
cd->init(zone); cd->init(zone);
cd->zone->owner->getObserver()->OpenedDisplay = cd; cd->zone->owner->getObserver()->OpenedDisplay = cd;

11
projects/mtg/src/MTGGameZones.cpp
View File

@@ -363,6 +363,16 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
if (!card->isToken) if (!card->isToken)
to = g->players[i]->game->exile; to = g->players[i]->game->exile;
} }
if (from == g->players[i]->game->library || from == g->players[i]->game->graveyard || from == g->players[i]->game->exile)
{
if (g->guiOpenDisplay)
{
g->ButtonPressed(g->guiOpenDisplay);
}
}
} }
//all cards that go from the hand to the graveyard is ALWAYS a discard. //all cards that go from the hand to the graveyard is ALWAYS a discard.
if ((to == g->players[0]->game->graveyard || to == g->players[1]->game->graveyard) && (from == g->players[0]->game->hand || from if ((to == g->players[0]->game->graveyard || to == g->players[1]->game->graveyard) && (from == g->players[0]->game->hand || from
@@ -370,6 +380,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
{ {
card->discarded = true; card->discarded = true;
} }
//When a card is moved from inPlay to inPlay (controller change, for example), it is still the same object //When a card is moved from inPlay to inPlay (controller change, for example), it is still the same object
if ((to == g->players[0]->game->inPlay || to == g->players[1]->game->inPlay) && (from == g->players[0]->game->inPlay || from if ((to == g->players[0]->game->inPlay || to == g->players[1]->game->inPlay) && (from == g->players[0]->game->inPlay || from
== g->players[1]->game->inPlay)) == g->players[1]->game->inPlay))