Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make getMenuText() return string.

Browse Source
This commit is contained in:
Tobias Loose
2013-11-29 13:33:33 +01:00
parent 6f083389c2
commit 69c6745f53
10 changed files with 180 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/include/ActionElement.h
View File

@@ -72,7 +72,7 @@ public:
{ {
return 0; return 0;
} }
virtual const char * getMenuText() virtual const string getMenuText()
{ {
return "Ability"; return "Ability";
} }

166
projects/mtg/include/AllAbilities.h
View File

@@ -1081,7 +1081,7 @@ public:
ManaCost * cost = NULL); ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AACounter * clone() const; AACounter * clone() const;
}; };
@@ -1100,7 +1100,7 @@ public:
bool all,ManaCost * cost = NULL); bool all,ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AARemoveAllCounter * clone() const; AARemoveAllCounter * clone() const;
}; };
@@ -1110,7 +1110,7 @@ class AAResetDamage: public ActivatedAbility
public: public:
AAResetDamage(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, ManaCost * cost = NULL); AAResetDamage(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AAResetDamage * clone() const; AAResetDamage * clone() const;
}; };
@@ -1120,7 +1120,7 @@ public:
string named; string named;
AAFakeAbility(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target,string _newName, ManaCost * cost = NULL); AAFakeAbility(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target,string _newName, ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AAFakeAbility * clone() const; AAFakeAbility * clone() const;
}; };
@@ -1131,7 +1131,7 @@ public:
AAFizzler(GameObserver* observer, int _id, MTGCardInstance * card, Spell * _target, ManaCost * _cost = NULL); AAFizzler(GameObserver* observer, int _id, MTGCardInstance * card, Spell * _target, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAFizzler* clone() const; AAFizzler* clone() const;
}; };
@@ -1160,7 +1160,7 @@ public:
string Cond; string Cond;
IfThenAbility(GameObserver* observer, int _id,MTGAbility * delayedAbility = NULL,MTGAbility * delayedElseAbility = NULL, MTGCardInstance * _source=NULL, Targetable * target = NULL, int type = 1,string Cond = ""); IfThenAbility(GameObserver* observer, int _id,MTGAbility * delayedAbility = NULL,MTGAbility * delayedElseAbility = NULL, MTGCardInstance * _source=NULL, Targetable * target = NULL, int type = 1,string Cond = "");
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
IfThenAbility * clone() const; IfThenAbility * clone() const;
~IfThenAbility(); ~IfThenAbility();
}; };
@@ -1179,7 +1179,7 @@ public:
void Update(float dt); void Update(float dt);
const char * getMenuText(); const string getMenuText();
int testDestroy(); int testDestroy();
int isReactingToTargetClick(Targetable * card); int isReactingToTargetClick(Targetable * card);
@@ -1209,7 +1209,7 @@ public:
bool CheckUserInput(JButton key); bool CheckUserInput(JButton key);
void Update(float dt); void Update(float dt);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
int testDestroy(); int testDestroy();
int isReactingToTargetClick(Targetable * card); int isReactingToTargetClick(Targetable * card);
int reactToTargetClick(Targetable * object); int reactToTargetClick(Targetable * object);
@@ -1225,7 +1225,7 @@ class AAProliferate: public ActivatedAbility
public: public:
AAProliferate(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,ManaCost * cost = NULL); AAProliferate(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AAProliferate * clone() const; AAProliferate * clone() const;
~AAProliferate(); ~AAProliferate();
}; };
@@ -1243,7 +1243,7 @@ public:
int resolve(); int resolve();
int addToGame(); int addToGame();
int destroy(); int destroy();
const char * getMenuText(); const string getMenuText();
MultiAbility * clone() const; MultiAbility * clone() const;
~MultiAbility(); ~MultiAbility();
}; };
@@ -1259,7 +1259,7 @@ public:
GenericActivatedAbility(GameObserver* observer, string newName,string castRestriction,int _id, MTGCardInstance * card, MTGAbility * a, ManaCost * _cost, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "", GenericActivatedAbility(GameObserver* observer, string newName,string castRestriction,int _id, MTGCardInstance * card, MTGAbility * a, ManaCost * _cost, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "",
int restrictions = 0, MTGGameZone * dest = NULL); int restrictions = 0, MTGGameZone * dest = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL); int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
void Update(float dt); void Update(float dt);
int testDestroy(); int testDestroy();
@@ -1274,7 +1274,7 @@ class AALibraryBottom: public ActivatedAbility
public: public:
AALibraryBottom(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL); AALibraryBottom(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AALibraryBottom * clone() const; AALibraryBottom * clone() const;
}; };
@@ -1284,7 +1284,7 @@ class AACopier: public ActivatedAbility
public: public:
AACopier(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL); AACopier(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AACopier * clone() const; AACopier * clone() const;
}; };
//imprint //imprint
@@ -1293,7 +1293,7 @@ class AAPhaseOut: public ActivatedAbility
public: public:
AAPhaseOut(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL); AAPhaseOut(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAPhaseOut * clone() const; AAPhaseOut * clone() const;
}; };
//cloning...this makes a token thats a copy of the target. //cloning...this makes a token thats a copy of the target.
@@ -1310,7 +1310,7 @@ public:
AACloner(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL, int who = 0, AACloner(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL, int who = 0,
string abilitiesStringList = "",string typeslist = ""); string abilitiesStringList = "",string typeslist = "");
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
AACloner * clone() const; AACloner * clone() const;
~AACloner(); ~AACloner();
@@ -1326,7 +1326,7 @@ public:
AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string dest,string _name, ManaCost * _cost = NULL); AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string dest,string _name, ManaCost * _cost = NULL);
MTGGameZone * destinationZone(Targetable * target = NULL); MTGGameZone * destinationZone(Targetable * target = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
const char * getMenuText(TargetChooser * fromTc); const char * getMenuText(TargetChooser * fromTc);
AAMover * clone() const; AAMover * clone() const;
~AAMover(); ~AAMover();
@@ -1342,7 +1342,7 @@ public:
AARandomMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string tcs, string from, string to); AARandomMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string tcs, string from, string to);
MTGGameZone * destinationZone(Targetable * target = NULL,string zone = ""); MTGGameZone * destinationZone(Targetable * target = NULL,string zone = "");
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AARandomMover * clone() const; AARandomMover * clone() const;
~AARandomMover(); ~AARandomMover();
}; };
@@ -1356,7 +1356,7 @@ public:
string menu; string menu;
AABuryCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target); AABuryCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AABuryCard * clone() const; AABuryCard * clone() const;
~AABuryCard(); ~AABuryCard();
}; };
@@ -1367,7 +1367,7 @@ public:
MTGAbility * andAbility; MTGAbility * andAbility;
AADestroyCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target); AADestroyCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AADestroyCard * clone() const; AADestroyCard * clone() const;
~AADestroyCard(); ~AADestroyCard();
}; };
@@ -1378,7 +1378,7 @@ public:
MTGAbility * andAbility; MTGAbility * andAbility;
AASacrificeCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target); AASacrificeCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AASacrificeCard * clone() const; AASacrificeCard * clone() const;
~AASacrificeCard(); ~AASacrificeCard();
}; };
@@ -1389,7 +1389,7 @@ public:
MTGAbility * andAbility; MTGAbility * andAbility;
AADiscardCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target); AADiscardCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AADiscardCard * clone() const; AADiscardCard * clone() const;
~AADiscardCard(); ~AADiscardCard();
}; };
@@ -1409,7 +1409,7 @@ public:
string tcString; string tcString;
GenericTargetAbility(GameObserver* observer, string newName, string castRestriction, int _id, MTGCardInstance * _source, TargetChooser * _tc, MTGAbility * a, ManaCost * _cost = NULL, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "", int restrictions = 0, MTGGameZone * dest = NULL,string tcString =""); GenericTargetAbility(GameObserver* observer, string newName, string castRestriction, int _id, MTGCardInstance * _source, TargetChooser * _tc, MTGAbility * a, ManaCost * _cost = NULL, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "", int restrictions = 0, MTGGameZone * dest = NULL,string tcString ="");
const char * getMenuText(); const string getMenuText();
~GenericTargetAbility(); ~GenericTargetAbility();
GenericTargetAbility * clone() const; GenericTargetAbility * clone() const;
int resolve(); int resolve();
@@ -1447,7 +1447,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return "Ninjutsu"; return "Ninjutsu";
} }
@@ -1479,7 +1479,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return "Remove From Combat"; return "Remove From Combat";
} }
@@ -1501,7 +1501,7 @@ public:
AADrawer(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost,string nbcardsStr, int who = AADrawer(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost,string nbcardsStr, int who =
TargetChooser::UNSET,bool noReplace = false); TargetChooser::UNSET,bool noReplace = false);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AADrawer * clone() const; AADrawer * clone() const;
int getNumCards(); int getNumCards();
}; };
@@ -1521,7 +1521,7 @@ public:
ACastRestriction(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, TargetChooser * _restrictionsScope, WParsedInt * _value, bool _modifyExisting, int _zoneId, int who = TargetChooser::UNSET); ACastRestriction(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, TargetChooser * _restrictionsScope, WParsedInt * _value, bool _modifyExisting, int _zoneId, int who = TargetChooser::UNSET);
int addToGame(); int addToGame();
int destroy(); int destroy();
const char * getMenuText(); const string getMenuText();
ACastRestriction * clone() const; ACastRestriction * clone() const;
~ACastRestriction(); ~ACastRestriction();
@@ -1536,7 +1536,7 @@ public:
AInstantCastRestrictionUEOT(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, TargetChooser * _restrictionsScope, WParsedInt * _value, bool _modifyExisting, int _zoneId, int who = TargetChooser::UNSET); AInstantCastRestrictionUEOT(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, TargetChooser * _restrictionsScope, WParsedInt * _value, bool _modifyExisting, int _zoneId, int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AInstantCastRestrictionUEOT * clone() const; AInstantCastRestrictionUEOT * clone() const;
~AInstantCastRestrictionUEOT(); ~AInstantCastRestrictionUEOT();
}; };
@@ -1549,7 +1549,7 @@ public:
AALifer(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string life_s, ManaCost * _cost = NULL, AALifer(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string life_s, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AALifer * clone() const; AALifer * clone() const;
int getLife(); int getLife();
@@ -1562,7 +1562,7 @@ public:
AAWinGame(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost = NULL, int who = AAWinGame(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost = NULL, int who =
TargetChooser::UNSET); TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAWinGame * clone() const; AAWinGame * clone() const;
}; };
@@ -1603,7 +1603,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return Constants::MTGBasicAbilities[ability]; return Constants::MTGBasicAbilities[ability];
} }
@@ -1645,7 +1645,7 @@ public:
return InstantAbility::addToGame(); return InstantAbility::addToGame();
} }
const char * getMenuText() const string getMenuText()
{ {
return Constants::MTGBasicAbilities[ability]; return Constants::MTGBasicAbilities[ability];
} }
@@ -1706,7 +1706,7 @@ public:
return ActivatedAbility::addToGame(); return ActivatedAbility::addToGame();
} }
const char * getMenuText() const string getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -1862,7 +1862,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
sprintf(menuText,"Protection from %s",tcstr.c_str()); sprintf(menuText,"Protection from %s",tcstr.c_str());
return menuText; return menuText;
@@ -2054,7 +2054,7 @@ public:
((MTGCardInstance *) target)->addToToughness(-wppt->toughness.getValue()); ((MTGCardInstance *) target)->addToToughness(-wppt->toughness.getValue());
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
if(PT.size()) if(PT.size())
{ {
@@ -2147,7 +2147,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -2189,7 +2189,7 @@ public:
return toAdd->addToGame(); return toAdd->addToGame();
} }
const char * getMenuText() const string getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -2287,7 +2287,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return "Regenerate"; return "Regenerate";
} }
@@ -2494,7 +2494,7 @@ public:
SAFE_DELETE(ability); SAFE_DELETE(ability);
} }
const char * getMenuText() const string getMenuText()
{ {
if(ability) if(ability)
{ {
@@ -2620,7 +2620,7 @@ public:
SAFE_DELETE(ability); SAFE_DELETE(ability);
} }
const char * getMenuText() const string getMenuText()
{ {
//Special case for move //Special case for move
if (AAMover * move = dynamic_cast<AAMover *>(ability)) if (AAMover * move = dynamic_cast<AAMover *>(ability))
@@ -2806,7 +2806,7 @@ public:
int equip(MTGCardInstance * equipped); int equip(MTGCardInstance * equipped);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
int testDestroy(); int testDestroy();
int destroy(); int destroy();
@@ -3034,7 +3034,7 @@ public:
card->setAttacker(1); card->setAttacker(1);
} }
const char * getMenuText() const string getMenuText()
{ {
sprintf(menuText, "Create %s", name.c_str()); sprintf(menuText, "Create %s", name.c_str());
return menuText; return menuText;
@@ -3135,7 +3135,7 @@ public:
} }
} }
const char * getMenuText() const string getMenuText()
{ {
if(name.size()) if(name.size())
return name.c_str(); return name.c_str();
@@ -3308,7 +3308,7 @@ public:
return 0; return 0;
} }
const char * getMenuText() const string getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -3520,7 +3520,7 @@ public:
} }
} }
const char * getMenuText() const string getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -3543,7 +3543,7 @@ public:
AASetHand(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int hand, ManaCost * _cost = NULL, AASetHand(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int hand, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AASetHand * clone() const; AASetHand * clone() const;
}; };
@@ -3557,7 +3557,7 @@ public:
AALifeSet(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, WParsedInt * life, ManaCost * _cost = NULL, AALifeSet(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, WParsedInt * life, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AALifeSet * clone() const; AALifeSet * clone() const;
~AALifeSet(); ~AALifeSet();
@@ -3574,7 +3574,7 @@ public:
AADamager(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, string d, ManaCost * _cost = NULL, AADamager(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, string d, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
int getDamage(); int getDamage();
AADamager * clone() const; AADamager * clone() const;
@@ -3588,7 +3588,7 @@ public:
AADamagePrevent(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int preventing, ManaCost * _cost = NULL, int who = TargetChooser::UNSET); AADamagePrevent(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int preventing, ManaCost * _cost = NULL, int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AADamagePrevent * clone() const; AADamagePrevent * clone() const;
~AADamagePrevent(); ~AADamagePrevent();
}; };
@@ -3602,7 +3602,7 @@ public:
AAAlterPoison(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int poison, ManaCost * _cost = NULL, AAAlterPoison(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int poison, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAAlterPoison * clone() const; AAAlterPoison * clone() const;
~AAAlterPoison(); ~AAAlterPoison();
}; };
@@ -3630,7 +3630,7 @@ class AATapper: public ActivatedAbility
public: public:
AATapper(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL); AATapper(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AATapper * clone() const; AATapper * clone() const;
}; };
@@ -3640,7 +3640,7 @@ class AAUntapper: public ActivatedAbility
public: public:
AAUntapper(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL); AAUntapper(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAUntapper * clone() const; AAUntapper * clone() const;
}; };
@@ -3661,7 +3661,7 @@ class AAFrozen: public ActivatedAbility
public: public:
AAFrozen(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL); AAFrozen(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAFrozen * clone() const; AAFrozen * clone() const;
}; };
/* ghetto new target*/ /* ghetto new target*/
@@ -3671,7 +3671,7 @@ public:
bool retarget; bool retarget;
AANewTarget(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target,bool retarget = false, ManaCost * _cost = NULL); AANewTarget(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target,bool retarget = false, ManaCost * _cost = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AANewTarget * clone() const; AANewTarget * clone() const;
}; };
/* morph*/ /* morph*/
@@ -3682,7 +3682,7 @@ public:
AAMorph(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL); AAMorph(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
int resolve(); int resolve();
int testDestroy(); int testDestroy();
const char * getMenuText(); const string getMenuText();
AAMorph * clone() const; AAMorph * clone() const;
}; };
/* flip*/ /* flip*/
@@ -3694,7 +3694,7 @@ public:
AAFlip(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target,string flipStats); AAFlip(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target,string flipStats);
int resolve(); int resolve();
int testDestroy(); int testDestroy();
const char * getMenuText(); const string getMenuText();
AAFlip * clone() const; AAFlip * clone() const;
}; };
/* dynamic ability build*/ /* dynamic ability build*/
@@ -3759,7 +3759,7 @@ string menu;
int resolve(); int resolve();
int activateMainAbility(MTGAbility * toActivate,MTGCardInstance * source , Damageable * target); int activateMainAbility(MTGAbility * toActivate,MTGCardInstance * source , Damageable * target);
int activateStored(); int activateStored();
const char * getMenuText(); const string getMenuText();
AADynamic * clone() const; AADynamic * clone() const;
~AADynamic(); ~AADynamic();
}; };
@@ -3812,7 +3812,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return "Swap power and toughness"; return "Swap power and toughness";
} }
@@ -3828,7 +3828,7 @@ public:
AAExchangeLife(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, ManaCost * _cost = NULL, AAExchangeLife(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAExchangeLife * clone() const; AAExchangeLife * clone() const;
}; };
@@ -4064,7 +4064,7 @@ public:
int reapplyCountersBonus(MTGCardInstance * rtarget= NULL,bool powerapplied=false,bool toughnessapplied=false); int reapplyCountersBonus(MTGCardInstance * rtarget= NULL,bool powerapplied=false,bool toughnessapplied=false);
int testDestroy(); int testDestroy();
int destroy(); int destroy();
const char * getMenuText(); const string getMenuText();
ATransformer * clone() const; ATransformer * clone() const;
~ATransformer(); ~ATransformer();
}; };
@@ -4087,7 +4087,7 @@ public:
ATransformerInstant(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, string types = "", string abilities = "",string newpower = "",bool newpowerfound = false,string newtoughness = "",bool newtoughnessfound = false,vector<string>newAbilitiesList = vector<string>(),bool newAbilityFound = false,bool aForever = false, bool UYNT = false,string menutext = ""); ATransformerInstant(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, string types = "", string abilities = "",string newpower = "",bool newpowerfound = false,string newtoughness = "",bool newtoughnessfound = false,vector<string>newAbilitiesList = vector<string>(),bool newAbilityFound = false,bool aForever = false, bool UYNT = false,string menutext = "");
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
ATransformerInstant * clone() const; ATransformerInstant * clone() const;
~ATransformerInstant(); ~ATransformerInstant();
}; };
@@ -4103,7 +4103,7 @@ public:
WParsedPT * newWppt; WParsedPT * newWppt;
PTInstant(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, WParsedPT * wppt,string s = "",bool nonstatic = false); PTInstant(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, WParsedPT * wppt,string s = "",bool nonstatic = false);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
PTInstant * clone() const; PTInstant * clone() const;
~PTInstant(); ~PTInstant();
}; };
@@ -4162,7 +4162,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return "Exalted"; return "Exalted";
} }
@@ -4180,7 +4180,7 @@ public:
ASwapPT * ability; ASwapPT * ability;
ASwapPTUEOT(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target); ASwapPTUEOT(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
ASwapPTUEOT * clone() const; ASwapPTUEOT * clone() const;
~ASwapPTUEOT(); ~ASwapPTUEOT();
}; };
@@ -4257,7 +4257,7 @@ public:
APreventDamageTypesUEOT(GameObserver* observer, int id, MTGCardInstance * source, string to, string from, int type = 0); APreventDamageTypesUEOT(GameObserver* observer, int id, MTGCardInstance * source, string to, string from, int type = 0);
int resolve(); int resolve();
int destroy(); int destroy();
const char * getMenuText(); const string getMenuText();
APreventDamageTypesUEOT * clone() const; APreventDamageTypesUEOT * clone() const;
~APreventDamageTypesUEOT(); ~APreventDamageTypesUEOT();
}; };
@@ -4274,7 +4274,7 @@ public:
AVanishing(GameObserver* observer, int _id, MTGCardInstance * card, ManaCost * _cost, int restrictions = 0,int amount = 0,string counterName = ""); AVanishing(GameObserver* observer, int _id, MTGCardInstance * card, ManaCost * _cost, int restrictions = 0,int amount = 0,string counterName = "");
void Update(float dt); void Update(float dt);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AVanishing * clone() const; AVanishing * clone() const;
~AVanishing(); ~AVanishing();
}; };
@@ -4296,7 +4296,7 @@ public:
void Update(float dt); void Update(float dt);
int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL); int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
AUpkeep * clone() const; AUpkeep * clone() const;
~AUpkeep(); ~AUpkeep();
@@ -4322,7 +4322,7 @@ public:
MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = true,bool opponentturn = true,bool once = false); MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = true,bool opponentturn = true,bool once = false);
void Update(float dt); void Update(float dt);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
APhaseAction * clone() const; APhaseAction * clone() const;
~APhaseAction(); ~APhaseAction();
}; };
@@ -4336,7 +4336,7 @@ public:
APhaseActionGeneric(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance * target, string sAbility, int restrictions = 0, int _phase = APhaseActionGeneric(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance * target, string sAbility, int restrictions = 0, int _phase =
MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = false,bool opponentturn = false,bool once = false); MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = false,bool opponentturn = false,bool once = false);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
APhaseActionGeneric * clone() const; APhaseActionGeneric * clone() const;
~APhaseActionGeneric(); ~APhaseActionGeneric();
@@ -4356,7 +4356,7 @@ public:
void Update(float dt); void Update(float dt);
void resolveBlink(); void resolveBlink();
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
ABlink * clone() const; ABlink * clone() const;
~ABlink(); ~ABlink();
private: private:
@@ -4374,7 +4374,7 @@ public:
MTGAbility * stored; MTGAbility * stored;
ABlinkGeneric(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance * _target,bool blinkueot=false,bool blinkForSource = false,bool blinkhand = false,MTGAbility * stored = NULL); ABlinkGeneric(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance * _target,bool blinkueot=false,bool blinkForSource = false,bool blinkhand = false,MTGAbility * stored = NULL);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
ABlinkGeneric * clone() const; ABlinkGeneric * clone() const;
~ABlinkGeneric(); ~ABlinkGeneric();
@@ -5280,7 +5280,7 @@ public:
return 1; return 1;
} }
const char * getMenuText() const string getMenuText()
{ {
return "phase alter"; return "phase alter";
} }
@@ -5299,7 +5299,7 @@ public:
AADepleter(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost = NULL, AADepleter(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AADepleter * clone() const; AADepleter * clone() const;
}; };
@@ -5312,7 +5312,7 @@ public:
AAModTurn(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbTurnStr, ManaCost * _cost = NULL, AAModTurn(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbTurnStr, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAModTurn * clone() const; AAModTurn * clone() const;
}; };
@@ -5323,7 +5323,7 @@ public:
AAShuffle(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost = NULL, int who = AAShuffle(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost = NULL, int who =
TargetChooser::UNSET); TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AAShuffle * clone() const; AAShuffle * clone() const;
}; };
@@ -5336,7 +5336,7 @@ public:
AARemoveMana(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, string ManaDesc, int who = TargetChooser::UNSET); AARemoveMana(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, string ManaDesc, int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AARemoveMana * clone() const; AARemoveMana * clone() const;
~AARemoveMana(); ~AARemoveMana();
@@ -5351,7 +5351,7 @@ public:
AARandomDiscarder(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost = NULL, AARandomDiscarder(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost = NULL,
int who = TargetChooser::UNSET); int who = TargetChooser::UNSET);
int resolve(); int resolve();
const char * getMenuText(); const string getMenuText();
AARandomDiscarder * clone() const; AARandomDiscarder * clone() const;
}; };
@@ -5523,7 +5523,7 @@ public:
int testDestroy(){return 0;}; int testDestroy(){return 0;};
void Update(float dt); void Update(float dt);
const char * getMenuText(); const string getMenuText();
int isReactingToTargetClick(Targetable * card); int isReactingToTargetClick(Targetable * card);
int reactToTargetClick(Targetable * object); int reactToTargetClick(Targetable * object);
MTGCardInstance * makeCard(); MTGCardInstance * makeCard();
@@ -5640,7 +5640,7 @@ public:
MTGAbility * abilityAltered; MTGAbility * abilityAltered;
AASetColorChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _color = 0 ,string toAdd = ""); AASetColorChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _color = 0 ,string toAdd = "");
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AASetColorChosen * clone() const; AASetColorChosen * clone() const;
~AASetColorChosen(); ~AASetColorChosen();
}; };
@@ -5653,7 +5653,7 @@ public:
MTGAbility * abilityAltered; MTGAbility * abilityAltered;
AASetTypeChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _type = 0,string menu = "error" ,string toAdd = ""); AASetTypeChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _type = 0,string menu = "error" ,string toAdd = "");
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AASetTypeChosen * clone() const; AASetTypeChosen * clone() const;
~AASetTypeChosen(); ~AASetTypeChosen();
}; };
@@ -5667,7 +5667,7 @@ public:
bool ANonWall; bool ANonWall;
GenericChooseTypeColor(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string toAdd = "",bool chooseColor = false,bool nonwall = false, ManaCost * cost = NULL); GenericChooseTypeColor(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string toAdd = "",bool chooseColor = false,bool nonwall = false, ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
GenericChooseTypeColor * clone() const; GenericChooseTypeColor * clone() const;
~GenericChooseTypeColor(); ~GenericChooseTypeColor();
@@ -5684,7 +5684,7 @@ public:
MTGAbility * abilityAltered; MTGAbility * abilityAltered;
AASetCoin(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int side = -1,string toAdd = ""); AASetCoin(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int side = -1,string toAdd = "");
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AASetCoin * clone() const; AASetCoin * clone() const;
~AASetCoin(); ~AASetCoin();
}; };
@@ -5695,7 +5695,7 @@ public:
AASetCoin * setCoin; AASetCoin * setCoin;
GenericFlipACoin(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string toAdd = "", ManaCost * cost = NULL); GenericFlipACoin(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string toAdd = "", ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
GenericFlipACoin * clone() const; GenericFlipACoin * clone() const;
~GenericFlipACoin(); ~GenericFlipACoin();
@@ -5714,7 +5714,7 @@ public:
GenericPaidAbility(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,string _newName,string _castRestriction,string _mayCost, string toAdd, ManaCost * cost = NULL); GenericPaidAbility(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,string _newName,string _castRestriction,string _mayCost, string toAdd, ManaCost * cost = NULL);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
GenericPaidAbility * clone() const; GenericPaidAbility * clone() const;
~GenericPaidAbility(); ~GenericPaidAbility();

6
projects/mtg/include/MTGAbility.h
View File

@@ -317,7 +317,7 @@ public:
virtual TargetAbility* clone() const = 0; virtual TargetAbility* clone() const = 0;
virtual void Render(); virtual void Render();
virtual int resolve(); virtual int resolve();
virtual const char * getMenuText(); virtual const string getMenuText();
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
}; };
@@ -436,7 +436,7 @@ public:
void Update(float dt); void Update(float dt);
virtual GenericTriggeredAbility* clone() const; virtual GenericTriggeredAbility* clone() const;
const char * getMenuText(); const string getMenuText();
~GenericTriggeredAbility(); ~GenericTriggeredAbility();
}; };
@@ -525,7 +525,7 @@ public:
int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL); int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL);
int resolve(); int resolve();
int reactToClick(MTGCardInstance* _card); int reactToClick(MTGCardInstance* _card);
const char * getMenuText(); const string getMenuText();
~AManaProducer(); ~AManaProducer();
virtual AManaProducer * clone() const; virtual AManaProducer * clone() const;
}; };

32
projects/mtg/include/MTGRules.h
View File

@@ -73,7 +73,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGPutInPlayRule(GameObserver* observer, int _id); MTGPutInPlayRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "cast card normally"; return "cast card normally";
} }
@@ -87,7 +87,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGKickerRule(GameObserver* observer, int _id); MTGKickerRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "pay kicker"; return "pay kicker";
} }
@@ -105,7 +105,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGAlternativeCostRule(GameObserver* observer, int _id); MTGAlternativeCostRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
if(alternativeName.size()) if(alternativeName.size())
return alternativeName.c_str(); return alternativeName.c_str();
@@ -121,7 +121,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGBuyBackRule(GameObserver* observer, int _id); MTGBuyBackRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "cast and buy back"; return "cast and buy back";
} }
@@ -136,7 +136,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGFlashBackRule(GameObserver* observer, int _id); MTGFlashBackRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "flash back"; return "flash back";
} }
@@ -150,7 +150,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGRetraceRule(GameObserver* observer, int _id); MTGRetraceRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "retrace"; return "retrace";
} }
@@ -165,7 +165,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGMorphCostRule(GameObserver* observer, int _id); MTGMorphCostRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "play morphed"; return "play morphed";
} }
@@ -181,7 +181,7 @@ public:
string suspendmenu; string suspendmenu;
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGSuspendRule(GameObserver* observer, int _id); MTGSuspendRule(GameObserver* observer, int _id);
const char * getMenuText(); const string getMenuText();
virtual MTGSuspendRule * clone() const; virtual MTGSuspendRule * clone() const;
}; };
@@ -195,7 +195,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGAttackRule(GameObserver* observer, int _id); MTGAttackRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "Attacker"; return "Attacker";
} }
@@ -213,7 +213,7 @@ public:
int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL); int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
MTGPlaneswalkerAttackRule(GameObserver* observer, int _id); MTGPlaneswalkerAttackRule(GameObserver* observer, int _id);
const char * getMenuText() const string getMenuText()
{ {
return "Attack Planeswalker"; return "Attack Planeswalker";
} }
@@ -226,7 +226,7 @@ public:
MTGCardInstance* attacker; MTGCardInstance* attacker;
AAPlaneswalkerAttacked(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target); AAPlaneswalkerAttacked(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target);
int resolve(); int resolve();
const char* getMenuText(); const string getMenuText();
AAPlaneswalkerAttacked * clone() const; AAPlaneswalkerAttacked * clone() const;
~AAPlaneswalkerAttacked(); ~AAPlaneswalkerAttacked();
}; };
@@ -252,7 +252,7 @@ public:
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
virtual ostream& toString(ostream& out) const; virtual ostream& toString(ostream& out) const;
MTGBlockRule(GameObserver* observer, int _id); MTGBlockRule(GameObserver* observer, int _id);
const char * getMenuText(); const string getMenuText();
virtual MTGBlockRule * clone() const; virtual MTGBlockRule * clone() const;
~MTGBlockRule(); ~MTGBlockRule();
}; };
@@ -386,7 +386,7 @@ public:
int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL); int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
int reactToClick(MTGCardInstance * card); int reactToClick(MTGCardInstance * card);
int reactToClick(MTGCardInstance * card, int id); int reactToClick(MTGCardInstance * card, int id);
const char * getMenuText() const string getMenuText()
{ {
return "Momir"; return "Momir";
} }
@@ -406,7 +406,7 @@ public:
MTGCardInstance * genEquip(int id); MTGCardInstance * genEquip(int id);
MTGStoneHewerRule(GameObserver* observer, int _id, MTGAllCards * _collection); MTGStoneHewerRule(GameObserver* observer, int _id, MTGAllCards * _collection);
int receiveEvent(WEvent * event); int receiveEvent(WEvent * event);
const char * getMenuText() const string getMenuText()
{ {
return "Stone Hewer"; return "Stone Hewer";
} }
@@ -419,7 +419,7 @@ class MTGHermitRule: public PermanentAbility
public: public:
MTGHermitRule(GameObserver* observer, int _id); MTGHermitRule(GameObserver* observer, int _id);
int receiveEvent(WEvent * event); int receiveEvent(WEvent * event);
const char * getMenuText() const string getMenuText()
{ {
return "Hermit"; return "Hermit";
} }
@@ -447,7 +447,7 @@ public:
int receiveEvent(WEvent * event); int receiveEvent(WEvent * event);
const char * getMenuText() const string getMenuText()
{ {
return "Deathtouch"; return "Deathtouch";
} }

2
projects/mtg/include/SimpleMenu.h
View File

@@ -43,7 +43,7 @@ public:
virtual bool CheckUserInput(JButton key); virtual bool CheckUserInput(JButton key);
virtual void Update(float dt); virtual void Update(float dt);
using JGuiController::Add; using JGuiController::Add;
virtual void Add(int id, const char * Text, string desc = "", bool forceFocus = false); virtual void Add(int id, const string &Text, string desc = "", bool forceFocus = false);
int getmCurr(){return mCurr;} int getmCurr(){return mCurr;}
float getWidth(){return mWidth; } float getWidth(){return mWidth; }
virtual void Close(); virtual void Close();

130
projects/mtg/src/AllAbilities.cpp
View File

@@ -71,7 +71,7 @@ int GenericActivatedAbility::resolve()
return 0; return 0;
} }
const char * GenericActivatedAbility::getMenuText() const string GenericActivatedAbility::getMenuText()
{ {
if(newName.size()) if(newName.size())
return newName.c_str(); return newName.c_str();
@@ -133,7 +133,7 @@ int AAAlterPoison::resolve()
return 0; return 0;
} }
const char * AAAlterPoison::getMenuText() const string AAAlterPoison::getMenuText()
{ {
return "Poison"; return "Poison";
} }
@@ -165,7 +165,7 @@ int AADamagePrevent::resolve()
return 0; return 0;
} }
const char * AADamagePrevent::getMenuText() const string AADamagePrevent::getMenuText()
{ {
return "Prevent Damage"; return "Prevent Damage";
} }
@@ -237,7 +237,7 @@ AADamager::AADamager(GameObserver* observer, int _id, MTGCardInstance * _source,
return damage.getValue(); return damage.getValue();
} }
const char * AADamager::getMenuText() const string AADamager::getMenuText()
{ {
MTGCardInstance * _target = dynamic_cast<MTGCardInstance*>(target); MTGCardInstance * _target = dynamic_cast<MTGCardInstance*>(target);
if(_target && _target->hasType(Subtypes::TYPE_PLANESWALKER)) if(_target && _target->hasType(Subtypes::TYPE_PLANESWALKER))
@@ -276,7 +276,7 @@ AADepleter::AADepleter(GameObserver* observer, int _id, MTGCardInstance * card,
return 1; return 1;
} }
const char * AADepleter::getMenuText() const string AADepleter::getMenuText()
{ {
return "Deplete"; return "Deplete";
} }
@@ -311,7 +311,7 @@ AAModTurn::AAModTurn(GameObserver* observer, int _id, MTGCardInstance * card, Ta
return 1; return 1;
} }
const char * AAModTurn::getMenuText() const string AAModTurn::getMenuText()
{ {
WParsedInt numTurns(nbTurnStr, NULL, source); WParsedInt numTurns(nbTurnStr, NULL, source);
if(numTurns.getValue() > 0) if(numTurns.getValue() > 0)
@@ -354,7 +354,7 @@ int AALibraryBottom::resolve()
return 0; return 0;
} }
const char * AALibraryBottom::getMenuText() const string AALibraryBottom::getMenuText()
{ {
return "Bottom Of Library"; return "Bottom Of Library";
} }
@@ -382,7 +382,7 @@ int AACopier::resolve()
return 0; return 0;
} }
const char * AACopier::getMenuText() const string AACopier::getMenuText()
{ {
return "Copy"; return "Copy";
} }
@@ -415,7 +415,7 @@ int AAPhaseOut::resolve()
return 0; return 0;
} }
const char * AAPhaseOut::getMenuText() const string AAPhaseOut::getMenuText()
{ {
return "Phase Out"; return "Phase Out";
} }
@@ -506,7 +506,7 @@ AACounter::AACounter(GameObserver* observer, int id, MTGCardInstance * source, M
return 0; return 0;
} }
const char* AACounter::getMenuText() const string AACounter::getMenuText()
{ {
if (menu.size()) if (menu.size())
{ {
@@ -695,7 +695,7 @@ int AARemoveAllCounter::resolve()
return nb; return nb;
} }
const char* AARemoveAllCounter::getMenuText() const string AARemoveAllCounter::getMenuText()
{ {
if (menu.size()) if (menu.size())
{ {
@@ -773,7 +773,7 @@ int AAProliferate::resolve()
} }
const char* AAProliferate::getMenuText() const string AAProliferate::getMenuText()
{ {
return "Proliferate"; return "Proliferate";
} }
@@ -837,7 +837,7 @@ int GenericChooseTypeColor::resolve()
} }
const char* GenericChooseTypeColor::getMenuText() const string GenericChooseTypeColor::getMenuText()
{ {
if(chooseColor) if(chooseColor)
return "Choose a color"; return "Choose a color";
@@ -899,7 +899,7 @@ int AASetColorChosen::resolve()
return 1; return 1;
} }
const char* AASetColorChosen::getMenuText() const string AASetColorChosen::getMenuText()
{ {
return Constants::MTGColorStrings[color]; return Constants::MTGColorStrings[color];
} }
@@ -956,7 +956,7 @@ int AASetTypeChosen::resolve()
return 1; return 1;
} }
const char* AASetTypeChosen::getMenuText() const string AASetTypeChosen::getMenuText()
{ {
return menutext.c_str(); return menutext.c_str();
} }
@@ -1003,7 +1003,7 @@ int GenericFlipACoin::resolve()
} }
const char* GenericFlipACoin::getMenuText() const string GenericFlipACoin::getMenuText()
{ {
return "Flip A Coin"; return "Flip A Coin";
} }
@@ -1095,7 +1095,7 @@ int AASetCoin::resolve()
return 1; return 1;
} }
const char* AASetCoin::getMenuText() const string AASetCoin::getMenuText()
{ {
if(side == 1) if(side == 1)
return "Tails"; return "Tails";
@@ -1186,7 +1186,7 @@ int GenericPaidAbility::resolve()
return 1; return 1;
} }
const char* GenericPaidAbility::getMenuText() const string GenericPaidAbility::getMenuText()
{ {
if (newName.size()) if (newName.size())
return newName.c_str(); return newName.c_str();
@@ -1288,7 +1288,7 @@ int AAResetDamage::resolve()
return 1; return 1;
} }
const char* AAResetDamage::getMenuText() const string AAResetDamage::getMenuText()
{ {
return "Reset Damages"; return "Reset Damages";
} }
@@ -1309,7 +1309,7 @@ int AAFakeAbility::resolve()
return 1; return 1;
} }
const char* AAFakeAbility::getMenuText() const string AAFakeAbility::getMenuText()
{ {
if(named.size()) if(named.size())
return named.c_str(); return named.c_str();
@@ -1356,7 +1356,7 @@ int AAFizzler::resolve()
return 1; return 1;
} }
const char * AAFizzler::getMenuText() const string AAFizzler::getMenuText()
{ {
return "Fizzle"; return "Fizzle";
} }
@@ -1403,7 +1403,7 @@ int AABuryCard::resolve()
return 0; return 0;
} }
const char * AABuryCard::getMenuText() const string AABuryCard::getMenuText()
{ {
if(menu.size()) if(menu.size())
return menu.c_str(); return menu.c_str();
@@ -1459,7 +1459,7 @@ int AADestroyCard::resolve()
return 0; return 0;
} }
const char * AADestroyCard::getMenuText() const string AADestroyCard::getMenuText()
{ {
return "Destroy"; return "Destroy";
} }
@@ -1515,7 +1515,7 @@ int AASacrificeCard::resolve()
return 0; return 0;
} }
const char * AASacrificeCard::getMenuText() const string AASacrificeCard::getMenuText()
{ {
return "Sacrifice"; return "Sacrifice";
} }
@@ -1570,7 +1570,7 @@ int AADiscardCard::resolve()
return 0; return 0;
} }
const char * AADiscardCard::getMenuText() const string AADiscardCard::getMenuText()
{ {
return "Discard"; return "Discard";
} }
@@ -1634,7 +1634,7 @@ AADrawer::AADrawer(GameObserver* observer, int _id, MTGCardInstance * card, Targ
return numCards.getValue(); return numCards.getValue();
} }
const char * AADrawer::getMenuText() const string AADrawer::getMenuText()
{ {
return "Draw"; return "Draw";
} }
@@ -1663,7 +1663,7 @@ int AAFrozen::resolve()
return 1; return 1;
} }
const char * AAFrozen::getMenuText() const string AAFrozen::getMenuText()
{ {
return "Freeze"; return "Freeze";
} }
@@ -1728,7 +1728,7 @@ int AANewTarget::resolve()
return 1; return 1;
} }
const char * AANewTarget::getMenuText() const string AANewTarget::getMenuText()
{ {
return "New Target"; return "New Target";
} }
@@ -1809,7 +1809,7 @@ int AAMorph::testDestroy()
return 0; return 0;
} }
const char * AAMorph::getMenuText() const string AAMorph::getMenuText()
{ {
return "Morph"; return "Morph";
} }
@@ -1946,7 +1946,7 @@ int AAFlip::testDestroy()
return 0; return 0;
} }
const char * AAFlip::getMenuText() const string AAFlip::getMenuText()
{ {
string s = flipStats; string s = flipStats;
sprintf(menuText, "Transform:%s", s.c_str()); sprintf(menuText, "Transform:%s", s.c_str());
@@ -2252,7 +2252,7 @@ int AADynamic::activateStored()
return 1; return 1;
} }
const char * AADynamic::getMenuText() const string AADynamic::getMenuText()
{ {
if (menu.size()) if (menu.size())
{ {
@@ -2367,7 +2367,7 @@ int AALifer::getLife()
return life.getValue(); return life.getValue();
} }
const char * AALifer::getMenuText() const string AALifer::getMenuText()
{ {
if(getLife() < 0) if(getLife() < 0)
return "Life Loss"; return "Life Loss";
@@ -2400,7 +2400,7 @@ int AASetHand::resolve()
return 1; return 1;
} }
const char * AASetHand::getMenuText() const string AASetHand::getMenuText()
{ {
return "Set Hand Size"; return "Set Hand Size";
} }
@@ -2431,7 +2431,7 @@ int AALifeSet::resolve()
return 1; return 1;
} }
const char * AALifeSet::getMenuText() const string AALifeSet::getMenuText()
{ {
return "Set Life"; return "Set Life";
} }
@@ -2513,7 +2513,7 @@ int AACloner::resolve()
} }
const char * AACloner::getMenuText() const string AACloner::getMenuText()
{ {
if (who == 1) if (who == 1)
return "Clone For Opponent"; return "Clone For Opponent";
@@ -2588,7 +2588,7 @@ int ACastRestriction::destroy()
return 1; return 1;
} }
const char * ACastRestriction::getMenuText() const string ACastRestriction::getMenuText()
{ {
if (modifyExisting) if (modifyExisting)
return "Additional Lands"; //hardoced because only the lands rule allows to modify existing rule for now return "Additional Lands"; //hardoced because only the lands rule allows to modify existing rule for now
@@ -2623,7 +2623,7 @@ int AInstantCastRestrictionUEOT::resolve()
wrapper->addToGame(); wrapper->addToGame();
return 1; return 1;
} }
const char * AInstantCastRestrictionUEOT::getMenuText() const string AInstantCastRestrictionUEOT::getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -2717,14 +2717,14 @@ int AAMover::resolve()
return 0; return 0;
} }
const char * AAMover::getMenuText() const string AAMover::getMenuText()
{ {
if(named.size()) if(named.size())
return named.c_str(); return named.c_str();
return "Move"; return "Move";
} }
const char * AAMover::getMenuText(TargetChooser * tc) const char* AAMover::getMenuText(TargetChooser * tc)
{ {
if(named.size()) if(named.size())
return named.c_str(); return named.c_str();
@@ -2864,7 +2864,7 @@ int AARandomMover::resolve()
return 0; return 0;
} }
const char * AARandomMover::getMenuText() const string AARandomMover::getMenuText()
{ {
return "Dig"; return "Dig";
} }
@@ -2902,7 +2902,7 @@ int AARandomDiscarder::resolve()
return 1; return 1;
} }
const char * AARandomDiscarder::getMenuText() const string AARandomDiscarder::getMenuText()
{ {
return "Discard Random"; return "Discard Random";
} }
@@ -2929,7 +2929,7 @@ int AAShuffle::resolve()
return 1; return 1;
} }
const char * AAShuffle::getMenuText() const string AAShuffle::getMenuText()
{ {
return "Shuffle"; return "Shuffle";
} }
@@ -3027,7 +3027,7 @@ int AARemoveMana::resolve()
return 1; return 1;
} }
const char * AARemoveMana::getMenuText() const string AARemoveMana::getMenuText()
{ {
if (mRemoveAll && !mManaDesc) if (mRemoveAll && !mManaDesc)
return "Empty Manapool"; return "Empty Manapool";
@@ -3066,7 +3066,7 @@ int AATapper::resolve()
return 1; return 1;
} }
const char * AATapper::getMenuText() const string AATapper::getMenuText()
{ {
return "Tap"; return "Tap";
} }
@@ -3096,7 +3096,7 @@ int AAUntapper::resolve()
return 1; return 1;
} }
const char * AAUntapper::getMenuText() const string AAUntapper::getMenuText()
{ {
return "Untap"; return "Untap";
} }
@@ -3177,7 +3177,7 @@ int AAWinGame::resolve()
return 1; return 1;
} }
const char * AAWinGame::getMenuText() const string AAWinGame::getMenuText()
{ {
return "Win Game"; return "Win Game";
} }
@@ -3268,7 +3268,7 @@ int IfThenAbility::resolve()
return 0; return 0;
} }
const char * IfThenAbility::getMenuText() const string IfThenAbility::getMenuText()
{ {
return ""; return "";
} }
@@ -3320,7 +3320,7 @@ void MayAbility::Update(float dt)
} }
} }
const char * MayAbility::getMenuText() const string MayAbility::getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -3456,7 +3456,7 @@ int MenuAbility::resolve()
return a->addToGame(); return a->addToGame();
} }
const char * MenuAbility::getMenuText() const string MenuAbility::getMenuText()
{ {
if((abilities.size() > 1 && must)||(abilities.size() > 2 && !must)) if((abilities.size() > 1 && must)||(abilities.size() > 2 && !must))
return "choose one"; return "choose one";
@@ -3657,7 +3657,7 @@ int MultiAbility::destroy()
return ActivatedAbility::destroy(); return ActivatedAbility::destroy();
} }
const char * MultiAbility::getMenuText() const string MultiAbility::getMenuText()
{ {
if (abilities.size() && abilities[0]) if (abilities.size() && abilities[0])
return abilities[0]->getMenuText(); return abilities[0]->getMenuText();
@@ -3696,7 +3696,7 @@ GenericTargetAbility::GenericTargetAbility(GameObserver* observer, string newNam
counters = 0; counters = 0;
} }
const char * GenericTargetAbility::getMenuText() const string GenericTargetAbility::getMenuText()
{ {
if (!ability) if (!ability)
return "Error"; return "Error";
@@ -4249,7 +4249,7 @@ int ATransformer::destroy()
return 1; return 1;
} }
const char * ATransformer::getMenuText() const string ATransformer::getMenuText()
{ {
if(menutext.size()) if(menutext.size())
return menutext.c_str(); return menutext.c_str();
@@ -4282,7 +4282,7 @@ int ATransformerInstant::resolve()
wrapper->addToGame(); wrapper->addToGame();
return 1; return 1;
} }
const char * ATransformerInstant::getMenuText() const string ATransformerInstant::getMenuText()
{ {
if(menu.size()) if(menu.size())
return menu.c_str(); return menu.c_str();
@@ -4316,7 +4316,7 @@ int PTInstant::resolve()
wrapper->addToGame(); wrapper->addToGame();
return 1; return 1;
} }
const char * PTInstant::getMenuText() const string PTInstant::getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -4347,7 +4347,7 @@ int ASwapPTUEOT::resolve()
return 1; return 1;
} }
const char * ASwapPTUEOT::getMenuText() const string ASwapPTUEOT::getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -4417,7 +4417,7 @@ int AAExchangeLife::resolve()
return 0; return 0;
} }
const char * AAExchangeLife::getMenuText() const string AAExchangeLife::getMenuText()
{ {
return "Exchange life"; return "Exchange life";
} }
@@ -4655,7 +4655,7 @@ int APreventDamageTypesUEOT::destroy()
return 1; return 1;
} }
const char * APreventDamageTypesUEOT::getMenuText() const string APreventDamageTypesUEOT::getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -4725,7 +4725,7 @@ int AVanishing::resolve()
return 1; return 1;
} }
const char * AVanishing::getMenuText() const string AVanishing::getMenuText()
{ {
if(counterName.find("fade") != string::npos) if(counterName.find("fade") != string::npos)
return "Fading"; return "Fading";
@@ -4821,7 +4821,7 @@ int AUpkeep::resolve()
return 1; return 1;
} }
const char * AUpkeep::getMenuText() const string AUpkeep::getMenuText()
{ {
return "Upkeep"; return "Upkeep";
} }
@@ -4921,7 +4921,7 @@ int APhaseAction::resolve()
return 0; return 0;
} }
const char * APhaseAction::getMenuText() const string APhaseAction::getMenuText()
{ {
if(psMenuText.size()) if(psMenuText.size())
return psMenuText.c_str(); return psMenuText.c_str();
@@ -4958,7 +4958,7 @@ int APhaseActionGeneric::resolve()
return 1; return 1;
} }
const char * APhaseActionGeneric::getMenuText() const string APhaseActionGeneric::getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -5116,7 +5116,7 @@ int ABlink::resolve()
{ {
return 0; return 0;
} }
const char * ABlink::getMenuText() const string ABlink::getMenuText()
{ {
return "Blink"; return "Blink";
} }
@@ -5147,7 +5147,7 @@ int ABlinkGeneric::resolve()
return 1; return 1;
} }
const char * ABlinkGeneric::getMenuText() const string ABlinkGeneric::getMenuText()
{ {
return "Blink"; return "Blink";
} }
@@ -5369,7 +5369,7 @@ int AEquip::resolve()
return 1; return 1;
} }
const char * AEquip::getMenuText() const string AEquip::getMenuText()
{ {
if (isAttach) if (isAttach)
return "Attach"; return "Attach";
@@ -5583,7 +5583,7 @@ int AACastCard::resolveSpell()
return 0; return 0;
} }
const char * AACastCard::getMenuText() const string AACastCard::getMenuText()
{ {
if(nameThis.size()) if(nameThis.size())
return nameThis.c_str(); return nameThis.c_str();

2
projects/mtg/src/GameStateStory.cpp
View File

@@ -65,7 +65,7 @@ void GameStateStory::Update(float dt)
if (!menu && mEngine->GetButtonClick(JGE_BTN_MENU)) if (!menu && mEngine->GetButtonClick(JGE_BTN_MENU))
{ {
menu = NEW SimpleMenu(JGE::GetInstance(), WResourceManager::Instance(), 100, this, Fonts::MENU_FONT, SCREEN_WIDTH / 2 - 100, 25); menu = NEW SimpleMenu(JGE::GetInstance(), WResourceManager::Instance(), 100, this, Fonts::MENU_FONT, SCREEN_WIDTH / 2 - 100, 25);
menu->Add(0, "Back to main menu"); menu->Add(0, string("Back to main menu"));
menu->Add(kCancelMenuID, "Cancel"); menu->Add(kCancelMenuID, "Cancel");
} }
if (menu) if (menu)

6
projects/mtg/src/MTGAbility.cpp
View File

@@ -4893,7 +4893,7 @@ int TargetAbility::resolve()
return 0; return 0;
} }
const char * TargetAbility::getMenuText() const string TargetAbility::getMenuText()
{ {
if (ability) if (ability)
return ability->getMenuText(); return ability->getMenuText();
@@ -5423,7 +5423,7 @@ GenericTriggeredAbility::~GenericTriggeredAbility()
SAFE_DELETE(destroyCondition); SAFE_DELETE(destroyCondition);
} }
const char * GenericTriggeredAbility::getMenuText() const string GenericTriggeredAbility::getMenuText()
{ {
return ability->getMenuText(); return ability->getMenuText();
} }
@@ -5516,7 +5516,7 @@ int AManaProducer::reactToClick(MTGCardInstance * _card)
return ActivatedAbility::activateAbility(); return ActivatedAbility::activateAbility();
} }
const char * AManaProducer::getMenuText() const string AManaProducer::getMenuText()
{ {
if (menutext.size()) if (menutext.size())
return menutext.c_str(); return menutext.c_str();

12
projects/mtg/src/MTGRules.cpp
View File

@@ -997,9 +997,9 @@ int MTGSuspendRule::reactToClick(MTGCardInstance * card)
return 1; return 1;
} }
const char * MTGSuspendRule::getMenuText() const string MTGSuspendRule::getMenuText()
{ {
return suspendmenu.c_str(); return suspendmenu;
} }
ostream& MTGSuspendRule::toString(ostream& out) const ostream& MTGSuspendRule::toString(ostream& out) const
@@ -1333,9 +1333,9 @@ int AAPlaneswalkerAttacked::resolve()
return 1; return 1;
} }
const char* AAPlaneswalkerAttacked::getMenuText() const string AAPlaneswalkerAttacked::getMenuText()
{ {
return menuText.c_str(); return menuText;
} }
AAPlaneswalkerAttacked * AAPlaneswalkerAttacked::clone() const AAPlaneswalkerAttacked * AAPlaneswalkerAttacked::clone() const
@@ -1597,9 +1597,9 @@ int MTGBlockRule::reactToClick(MTGCardInstance * card)
return 1; return 1;
} }
const char * MTGBlockRule::getMenuText() const string MTGBlockRule::getMenuText()
{ {
return blockmenu.c_str(); return blockmenu;
} }
ostream& MTGBlockRule::toString(ostream& out) const ostream& MTGBlockRule::toString(ostream& out) const

2
projects/mtg/src/SimpleMenu.cpp
View File

@@ -328,7 +328,7 @@ void SimpleMenu::Update(float dt)
} }
} }
void SimpleMenu::Add(int id, const char * text, string desc, bool forceFocus) void SimpleMenu::Add(int id, const string& text, string desc, bool forceFocus)
{ {
SimpleMenuItem * smi = NEW SimpleMenuItem(this, id, fontId, text, 0, mY + SimpleMenuConst::kVerticalMargin + mCount * SimpleMenuConst::kLineHeight, SimpleMenuItem * smi = NEW SimpleMenuItem(this, id, fontId, text, 0, mY + SimpleMenuConst::kVerticalMargin + mCount * SimpleMenuConst::kLineHeight,
(mCount == 0), autoTranslate); (mCount == 0), autoTranslate);