From cc75fc42db582a8f20eb0a8e767ef2cbbaf24853 Mon Sep 17 00:00:00 2001 From: zethfoxster Date: Mon, 11 Jul 2016 19:32:57 -0400 Subject: [PATCH 1/2] fixed a memleak that triggered with cards like vise, we were leaving this funtion without deleting an event that was not being sent. --- projects/mtg/src/Damage.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/mtg/src/Damage.cpp b/projects/mtg/src/Damage.cpp index b5a94633c..17bd6b9bd 100644 --- a/projects/mtg/src/Damage.cpp +++ b/projects/mtg/src/Damage.cpp @@ -52,7 +52,10 @@ int Damage::resolve() damage = ev->damage->damage; target = ev->damage->target; if (!damage) + { + delete (e); return 0; + } //asorbing effects for cards controller----------- From f438548e5c8c985dbcdd59a80cbdc3df49e27b64 Mon Sep 17 00:00:00 2001 From: zethfoxster Date: Mon, 11 Jul 2016 23:46:03 -0400 Subject: [PATCH 2/2] teaching ai to select X on the menu again. --- projects/mtg/src/AIPlayerBaka.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/AIPlayerBaka.cpp b/projects/mtg/src/AIPlayerBaka.cpp index 2da274c4c..4262b0624 100644 --- a/projects/mtg/src/AIPlayerBaka.cpp +++ b/projects/mtg/src/AIPlayerBaka.cpp @@ -1681,10 +1681,16 @@ int AIPlayerBaka::selectMenuOption() } } if(currentMenu) - for(unsigned int mk = 0;mk < currentMenu->abilities.size();mk++) + for (unsigned int mk = 0; mk < currentMenu->abilities.size(); mk++) { + if (dynamic_cast(currentMenu->abilities[0])) + { + int potent = manaPool->getConvertedCost(); + int aftercost = potent - currentMenu->abilities[0]->source->getManaCost()->getConvertedCost(); + return aftercost; + } int checked = getEfficiency(currentMenu->abilities[mk]); - if(checked > 60 && checked > checkedLast) + if (checked > 60 && checked > checkedLast) { doThis = mk; checkedLast = checked;