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

Erwan

Browse Source 
- fix issue 149
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-11-03 07:40:14 +00:00
parent ff947737dc
commit befb3f246b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/Res/test/bugs/kicker_crash_i149.txt
+1 -2
View File
@@ -9,9 +9,8 @@ hand:kavu aggressor
[DO] [DO]
ai ai
[ASSERT] [ASSERT]
combatblockers UNTAP
[PLAYER1] [PLAYER1]
inplay:mountain,mountain,mountain,kavu aggressor inplay:mountain,mountain,mountain,kavu aggressor
hand:
[PLAYER2] [PLAYER2]
[END] [END]
projects/mtg/src/MTGAbility.cpp
+2 -1
View File
@@ -164,6 +164,7 @@ TriggeredAbility * AbilityFactory::parseTrigger(string magicText, int id, Spell
//Parses a string and returns the corresponding MTGAbility object //Parses a string and returns the corresponding MTGAbility object
// Returns NULL if parsing failed // Returns NULL if parsing failed
//Beware, Spell CAN be null when the function is called by the AI trying to analyze the effects of a given card
MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTGCardInstance *card, int activated, int forceUEOT){ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTGCardInstance *card, int activated, int forceUEOT){
size_t found; size_t found;
@@ -251,7 +252,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
//kicker cost //kicker cost
found = s.find("kicker "); found = s.find("kicker ");
if (found == 0){ if (found == 0){
if (spell->kickerWasPaid()){ if (spell && spell->kickerWasPaid()){
string s1 = s.substr(found+7); string s1 = s.substr(found+7);
return parseMagicLine(s1,id,spell, card); return parseMagicLine(s1,id,spell, card);
} }