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

Fix Compilation

Browse Source
This commit is contained in:
Anthony Calosa
2016-07-28 16:38:16 +08:00
parent cc7077d783
commit 30dab27202
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/Res/test/_tests.txt
+1
View File
@@ -682,6 +682,7 @@ tidal_warrior_i646.txt
tidal_warrior_i649.txt tidal_warrior_i649.txt
tidal_warrior_i652.txt tidal_warrior_i652.txt
Timely_Reinforcements.txt Timely_Reinforcements.txt
TirelessTracker.txt
titanic_ultimatum.txt titanic_ultimatum.txt
tokenizer.txt tokenizer.txt
tokenizer2.txt tokenizer2.txt
projects/mtg/include/AllAbilities.h
+2 -2
View File
@@ -1370,8 +1370,8 @@ public:
{ {
WEventCardSacrifice * e = dynamic_cast<WEventCardSacrifice *> (event); WEventCardSacrifice * e = dynamic_cast<WEventCardSacrifice *> (event);
if (!e) return 0; if (!e) return 0;
//if (e->istoken) if (e->istoken)
// return 1; return 1;
MTGCardInstance * check = e->cardAfter; MTGCardInstance * check = e->cardAfter;
MTGGameZone * oldZone = e->cardAfter->currentZone; MTGGameZone * oldZone = e->cardAfter->currentZone;
check->currentZone = check->previousZone; check->currentZone = check->previousZone;
projects/mtg/src/GameObserver.cpp
+2
View File
@@ -1132,6 +1132,7 @@ void GameObserver::Affinity()
} }
///we handle trisnisphere seperately because its a desaster. ///we handle trisnisphere seperately because its a desaster.
if(card->getManaCost())//make sure we check, abiliy$!/token dont have a mancost object. if(card->getManaCost())//make sure we check, abiliy$!/token dont have a mancost object.
{
if (card->has(Constants::TRINISPHERE)) if (card->has(Constants::TRINISPHERE))
{ {
for (int jj = card->getManaCost()->getConvertedCost(); jj < 3; jj++) for (int jj = card->getManaCost()->getConvertedCost(); jj < 3; jj++)
@@ -1148,6 +1149,7 @@ void GameObserver::Affinity()
card->countTrini = 0; card->countTrini = 0;
} }
} }
}
/////////////////////// ///////////////////////
bool NewAffinityFound = false; bool NewAffinityFound = false;
for (unsigned int na = 0; na < card->cardsAbilities.size(); na++) for (unsigned int na = 0; na < card->cardsAbilities.size(); na++)