From 3ee09742b64f1bf321a253468fe20d4262f67c6f Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Fri, 24 Sep 2010 17:11:50 +0000 Subject: [PATCH] bug fix for Token Crash when Id was not found in Card.dat. --- projects/mtg/src/MTGAbility.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 9f21cb2f3..780da30a0 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -665,10 +665,17 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG size_t end = s.find(")", found); int tokenId = atoi(s.substr(found + 6,end - found - 6).c_str()); if (tokenId){ + MTGCard * safetycard = GameApp::collection->getCardById(tokenId); + if (safetycard){//contenue ATokenCreator * tok = NEW ATokenCreator(id,card,NULL,tokenId,0, multiplier); tok->oneShot = 1; return tok; - } + }else{ + tokenId = 0; + ATokenCreator * tok = NEW ATokenCreator(id,card,NULL,"ID NOT FOUND","ERROR ID",NULL,NULL,"",0,NULL); + return tok; + } + } end = s.find(",", found); string sname = s.substr(found + 6,end - found - 6);