From cee2da600d2541bdf791defbf97988c9caec3bad Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Sun, 10 Jan 2010 09:48:26 +0000 Subject: [PATCH] Erwan - fix a bug where the AI would crash when playing cards with cycling or any other "autohand" ability --- projects/mtg/src/AIPlayer.cpp | 2 +- projects/mtg/src/ActionLayer.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index 655ed4669..de565d23f 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -21,7 +21,7 @@ int AIAction::Act(){ if (target) g->cardClick(target); return 1; }else if (click){ //Shouldn't be used, really... - g->cardClick(click); + g->cardClick(click,click); if (target) g->cardClick(target); return 1; } diff --git a/projects/mtg/src/ActionLayer.cpp b/projects/mtg/src/ActionLayer.cpp index eaf4d7ab4..c6fc19ae2 100644 --- a/projects/mtg/src/ActionLayer.cpp +++ b/projects/mtg/src/ActionLayer.cpp @@ -217,6 +217,10 @@ int ActionLayer::reactToClick(MTGCardInstance * card){ void ActionLayer::setMenuObject(Targetable * object, bool must){ + if (!object){ + OutputDebugString("FATAL: ActionLayer::setMenuObject\n"); + return; + } menuObject = object; SAFE_DELETE(abilitiesMenu);