From 0f82b6efba00fc91289967079c729ca96795ac80 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 26 Feb 2017 15:22:16 +0800 Subject: [PATCH] crash fix mana ability filter --- projects/mtg/src/ManaCost.cpp | 2 ++ projects/mtg/src/WFilter.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/ManaCost.cpp b/projects/mtg/src/ManaCost.cpp index 4c9b13da2..328e49577 100644 --- a/projects/mtg/src/ManaCost.cpp +++ b/projects/mtg/src/ManaCost.cpp @@ -39,6 +39,8 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan string value = s.substr(start -1,end); if(value == "n{")//"restrictio n{m orbid} would read the n{m as {m} millcost return manaCost; + else if(value == "e{")//"variable{ test fix + return manaCost; } if (start == string::npos) { diff --git a/projects/mtg/src/WFilter.cpp b/projects/mtg/src/WFilter.cpp index 4d3f0b058..38f894dfc 100644 --- a/projects/mtg/src/WFilter.cpp +++ b/projects/mtg/src/WFilter.cpp @@ -272,7 +272,7 @@ bool WCFilterProducesColor::isMatch(MTGCard * c) //Retrieve non basic Mana abilities string s = c->data->magicText; - size_t t = s.find("add"); + size_t t = s.find("add{"); while (t != string::npos) { s = s.substr(t + 3);