diff --git a/projects/mtg/include/MTGCardInstance.h b/projects/mtg/include/MTGCardInstance.h index 963520320..c2f85062f 100644 --- a/projects/mtg/include/MTGCardInstance.h +++ b/projects/mtg/include/MTGCardInstance.h @@ -38,9 +38,9 @@ class MTGCardInstance: public CardPrimitive, public MTGCard, public Damageable { int setDefenser(MTGCardInstance * c); int addBlocker(MTGCardInstance * c); int removeBlocker(MTGCardInstance * c); - int setAttacker(int value); int init(); public: + int setAttacker(int value); MTGGameZone * currentZone; Pos* view; int X; diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index cdd0d5286..984f42860 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -694,6 +694,7 @@ int MTGAttackRule::receiveEvent(WEvent *e){ for (int i= 0; i < z->nb_cards; i++){ MTGCardInstance * card = z->cards[i]; if (!card->isAttacker() && card->has(Constants::MUSTATTACK)) reactToClick(card); + if (card->isAttacker() && card->isTapped()) card->setAttacker(0); if (card->isAttacker() && !card->has(Constants::VIGILANCE)) card->tap(); } return 1;