From 5e34cce734ba9c3c97ae6277160df1f92f501932 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Thu, 21 Oct 2010 20:48:39 +0000 Subject: [PATCH] changed This(equip) to ThisAttacked(gear) and changed varible name also, there was a discovered conflict using these as equip, with the MTGAbility equip --- projects/mtg/include/AllAbilities.h | 2 +- projects/mtg/src/ThisDescriptor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index d7a22bba3..35910bf69 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -56,7 +56,7 @@ public: intValue = computeX(spell,card); }else if (s == "xx" || s == "XX"){ intValue = computeXX(spell,card); - }else if (s == "equips"){ + }else if (s == "gear"){ intValue = target->equipment; }else if (s == "manacost"){ intValue = target->getManaCost()->getConvertedCost(); diff --git a/projects/mtg/src/ThisDescriptor.cpp b/projects/mtg/src/ThisDescriptor.cpp index 5d5aa8684..359bc284d 100644 --- a/projects/mtg/src/ThisDescriptor.cpp +++ b/projects/mtg/src/ThisDescriptor.cpp @@ -127,7 +127,7 @@ ThisDescriptor * ThisDescriptorFactory::createThisDescriptor(string s){ } //equips - found = s.find("equip"); + found = s.find("gear");//still same meaning, better wording to word conflict with MTGAbility equip. if (found != string::npos) { ThisEquip * td = NEW ThisEquip(criterion); if (td) {