From 5020d41023bda66518d38c141efec4ec6ef987e8 Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Thu, 3 Dec 2009 14:04:05 +0000 Subject: [PATCH] Erwan -fix issue 221 (legendaries+animate dead) --- projects/mtg/bin/Res/test/_tests.txt | 3 +++ .../bin/Res/test/{bugs => }/animated_legendaries1_i221.txt | 0 .../bin/Res/test/{bugs => }/animated_legendaries2_i221.txt | 0 .../bin/Res/test/{bugs => }/animated_legendaries3_i221.txt | 0 projects/mtg/src/MTGRules.cpp | 4 ++-- 5 files changed, 5 insertions(+), 2 deletions(-) rename projects/mtg/bin/Res/test/{bugs => }/animated_legendaries1_i221.txt (100%) rename projects/mtg/bin/Res/test/{bugs => }/animated_legendaries2_i221.txt (100%) rename projects/mtg/bin/Res/test/{bugs => }/animated_legendaries3_i221.txt (100%) diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index fad51623f..85d34d28f 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -58,6 +58,9 @@ animate_artifact2.txt animate_dead.txt animate_dead2.txt animate_dead3.txt +animated_legendaries1_i221.txt +animated_legendaries2_i221.txt +animated_legendaries3_i221.txt ankh_of_mishra.txt arcanis_the_omnipotent.txt arcanis_the_omnipotent2.txt diff --git a/projects/mtg/bin/Res/test/bugs/animated_legendaries1_i221.txt b/projects/mtg/bin/Res/test/animated_legendaries1_i221.txt similarity index 100% rename from projects/mtg/bin/Res/test/bugs/animated_legendaries1_i221.txt rename to projects/mtg/bin/Res/test/animated_legendaries1_i221.txt diff --git a/projects/mtg/bin/Res/test/bugs/animated_legendaries2_i221.txt b/projects/mtg/bin/Res/test/animated_legendaries2_i221.txt similarity index 100% rename from projects/mtg/bin/Res/test/bugs/animated_legendaries2_i221.txt rename to projects/mtg/bin/Res/test/animated_legendaries2_i221.txt diff --git a/projects/mtg/bin/Res/test/bugs/animated_legendaries3_i221.txt b/projects/mtg/bin/Res/test/animated_legendaries3_i221.txt similarity index 100% rename from projects/mtg/bin/Res/test/bugs/animated_legendaries3_i221.txt rename to projects/mtg/bin/Res/test/animated_legendaries3_i221.txt diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index 622d7ea06..0139c9576 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -501,8 +501,8 @@ HUDDisplay::~HUDDisplay(){ for ( it=cards.begin() ; it != cards.end(); it++ ){ MTGCardInstance * comparison = (*it).first; if (comparison != card && !(comparison->getName().compare(card->getName()))){ - comparison->owner->game->putInGraveyard(comparison); - destroy = 1; + comparison->controller()->game->putInGraveyard(comparison); + destroy = 1; } } if (destroy){