diff --git a/projects/mtg/bin/Res/test/bugs/control_change_untap_i192.txt b/projects/mtg/bin/Res/test/manual/control_change_untap_i192.txt similarity index 96% rename from projects/mtg/bin/Res/test/bugs/control_change_untap_i192.txt rename to projects/mtg/bin/Res/test/manual/control_change_untap_i192.txt index b6b9a29b0..e10e3f008 100644 --- a/projects/mtg/bin/Res/test/bugs/control_change_untap_i192.txt +++ b/projects/mtg/bin/Res/test/manual/control_change_untap_i192.txt @@ -12,6 +12,7 @@ #DESC: display doesn't change, but Assassinate #DESC: cannot target it any more. Conclusion: The #DESC: game state is correct, but the display not. +[INIT] firstmain [PLAYER1] hand:Control Magic,Enervate,Assassinate,Twitch diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index 2b0c47325..0d70e2e91 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -231,7 +231,8 @@ int GuiPlay::receiveEventPlus(WEvent * e) else card = NEW CardView(CardSelector::playZone, event->card, 0, 0); cards.push_back(card); - card->t = 0; card->alpha = 255; + card->t = event->card->isTapped() ? M_PI / 2 : 0; + card->alpha = 255; cs->Add(card); Replace(); return 1; diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 06b13eaf4..5da57da96 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -148,19 +148,13 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone } MTGCardInstance * ret = copy; - /*if (card->isToken){ - if (to != g->players[0]->game->inPlay && to != g->players[1]->game->inPlay){ - to = garbage; - ret = NULL; - } - }*/ to->addCard(copy); copy->changedZoneRecently = 1.f; GameObserver *g = GameObserver::GetInstance(); WEvent * e = NEW WEventZoneChange(copy, from, to); g->receiveEvent(e); - //delete e; + return ret; } return card; //Error