Erwan
-fix issue 192 (graphical issue when tapped card changes controller)
This commit is contained in:
+1
@@ -12,6 +12,7 @@
|
|||||||
#DESC: display doesn't change, but Assassinate
|
#DESC: display doesn't change, but Assassinate
|
||||||
#DESC: cannot target it any more. Conclusion: The
|
#DESC: cannot target it any more. Conclusion: The
|
||||||
#DESC: game state is correct, but the display not.
|
#DESC: game state is correct, but the display not.
|
||||||
|
[INIT]
|
||||||
firstmain
|
firstmain
|
||||||
[PLAYER1]
|
[PLAYER1]
|
||||||
hand:Control Magic,Enervate,Assassinate,Twitch
|
hand:Control Magic,Enervate,Assassinate,Twitch
|
||||||
@@ -231,7 +231,8 @@ int GuiPlay::receiveEventPlus(WEvent * e)
|
|||||||
else
|
else
|
||||||
card = NEW CardView(CardSelector::playZone, event->card, 0, 0);
|
card = NEW CardView(CardSelector::playZone, event->card, 0, 0);
|
||||||
cards.push_back(card);
|
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);
|
cs->Add(card);
|
||||||
Replace();
|
Replace();
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -148,19 +148,13 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
|
|||||||
}
|
}
|
||||||
|
|
||||||
MTGCardInstance * ret = copy;
|
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);
|
to->addCard(copy);
|
||||||
copy->changedZoneRecently = 1.f;
|
copy->changedZoneRecently = 1.f;
|
||||||
GameObserver *g = GameObserver::GetInstance();
|
GameObserver *g = GameObserver::GetInstance();
|
||||||
WEvent * e = NEW WEventZoneChange(copy, from, to);
|
WEvent * e = NEW WEventZoneChange(copy, from, to);
|
||||||
g->receiveEvent(e);
|
g->receiveEvent(e);
|
||||||
//delete e;
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
return card; //Error
|
return card; //Error
|
||||||
|
|||||||
Reference in New Issue
Block a user