From 3b447135fbdc331d679d5e714e8bf42a717bd37d Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Sun, 26 Aug 2012 08:08:36 +0000 Subject: [PATCH] fixed soulbond and testsuite issue, fixed crash from combohint not being int'ed to some AIStats(which are considered "human" --- projects/mtg/src/AIPlayerBaka.cpp | 1 + projects/mtg/src/MTGRules.cpp | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/projects/mtg/src/AIPlayerBaka.cpp b/projects/mtg/src/AIPlayerBaka.cpp index 301b8ab1f..6e1a7315e 100644 --- a/projects/mtg/src/AIPlayerBaka.cpp +++ b/projects/mtg/src/AIPlayerBaka.cpp @@ -2397,6 +2397,7 @@ AIPlayerBaka::AIPlayerBaka(GameObserver *observer, string file, string fileSmall //Initialize "AIHints" system hints = NULL; + comboHint = NULL; if (mDeck && mDeck->meta_AIHints.size()) { hints = NEW AIHints(this); diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index 477316ba5..37441f6d9 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -2000,7 +2000,7 @@ int MTGSoulbondRule::receiveEvent(WEvent * event) MTGCardInstance * card = e->card; if (!card || !card->isCreature()) return 0; int ok = 0; - if(card->basicAbilities[(int)Constants::soulbond] || soulbonders.size()) + if(card->has(Constants::soulbond) || soulbonders.size()) { for (int i = 0; i < 2; i++) { @@ -2082,13 +2082,7 @@ MTGSoulbondRule * MTGSoulbondRule::clone() const { return NEW MTGSoulbondRule(*this); } -MTGSoulbondRule::~MTGSoulbondRule() -{ - for(size_t k = pairing.size()-1;k > 0; k--) - { - //SAFE_DELETE(pairing[k]); - } -} + /* Persist */ MTGPersistRule::MTGPersistRule(GameObserver* observer, int _id) : PermanentAbility(observer, _id)