From 60e9b2c1dfd2542efe8938eda1575e72ebe8fa3c Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Tue, 3 Nov 2009 10:31:57 +0000 Subject: [PATCH] Erwan -fix issue 146 --- projects/mtg/bin/Res/test/_tests.txt | 1 + .../bin/Res/test/{bugs => generic}/regenerate_wither_i146.txt | 0 .../mtg/bin/Res/test/{bugs => manual}/kicker_crash_i149.txt | 0 projects/mtg/src/AIStats.cpp | 2 +- projects/mtg/src/MTGCardInstance.cpp | 1 + 5 files changed, 3 insertions(+), 1 deletion(-) rename projects/mtg/bin/Res/test/{bugs => generic}/regenerate_wither_i146.txt (100%) rename projects/mtg/bin/Res/test/{bugs => manual}/kicker_crash_i149.txt (100%) diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index a6c2a2553..75c492ab3 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -25,6 +25,7 @@ generic/phases.txt generic/rampage.txt generic/rampage2.txt generic/regenerate.txt +generic/regenerate_wither_i146.txt generic/sacrifice.txt generic/summoning_sickness.txt generic/targetController_life.txt diff --git a/projects/mtg/bin/Res/test/bugs/regenerate_wither_i146.txt b/projects/mtg/bin/Res/test/generic/regenerate_wither_i146.txt similarity index 100% rename from projects/mtg/bin/Res/test/bugs/regenerate_wither_i146.txt rename to projects/mtg/bin/Res/test/generic/regenerate_wither_i146.txt diff --git a/projects/mtg/bin/Res/test/bugs/kicker_crash_i149.txt b/projects/mtg/bin/Res/test/manual/kicker_crash_i149.txt similarity index 100% rename from projects/mtg/bin/Res/test/bugs/kicker_crash_i149.txt rename to projects/mtg/bin/Res/test/manual/kicker_crash_i149.txt diff --git a/projects/mtg/src/AIStats.cpp b/projects/mtg/src/AIStats.cpp index e950ecfdc..cdd4e5945 100644 --- a/projects/mtg/src/AIStats.cpp +++ b/projects/mtg/src/AIStats.cpp @@ -47,7 +47,7 @@ int AIStats::receiveEvent(WEvent * event){ WEventDamage * e = dynamic_cast(event); if (!e) return 0; //we take only Damage events into accountright now Damage * damage = e->damage; - MTGGameZone * opponentZone = player->opponent()->game->inPlay; + MTGGameZone * opponentZone = player->opponent()->game->inPlay; MTGCardInstance * card = damage->source; updateStatsCard(card,damage); diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index eebd7cd6e..a3d3a2039 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -245,6 +245,7 @@ int MTGCardInstance::triggerRegenerate(){ tap(); life = toughness; initAttackersDefensers(); + if (life < 1) return 0; //regeneration didn't work (wither ?) return 1; }