From 120da0388c031e881e0081e8ad164d3a9fd81418 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Sat, 11 Sep 2010 18:00:48 +0000 Subject: [PATCH] fixed 3 memleaks in ability "transforms" --- projects/mtg/include/AllAbilities.h | 4 ++-- projects/mtg/src/MTGAbility.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 846d12502..bef91ecac 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2617,7 +2617,7 @@ public: a->isClone = 1; return a; } - ~ABloodThirst(){} + ~ABloodThirst(){} }; //reduce or increase manacost of target by color:amount------------------------------------------ class AManaRedux:public MTGAbility{ @@ -2798,7 +2798,7 @@ public: a->ability = this->ability->clone(); a->isClone = 1; return a;} - ~ATransformerFOREVER(){ + ~ATransformerFOREVER(){delete ability; }}; //becomes ability //Adds types/abilities/P/T to a card (aura) diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 2b5906194..2f14ae9cf 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1176,11 +1176,12 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG sabilities = s.substr(end+1, real_end - end); } MTGAbility * a; - if (forceUEOT){ + if(forceFOREVER){a = NEW ATransformerFOREVER(id,card,target,stypes,sabilities); + } + else if (forceUEOT){ a = NEW ATransformerUEOT(id,card,target,stypes,sabilities); }else{ a = NEW ATransformer(id,card,target,stypes,sabilities); - }if(forceFOREVER){a = NEW ATransformerFOREVER(id,card,target,stypes,sabilities); } return a; }