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

Revert "TrcardDrawn, TrDamaged, TrLifeGained"

Browse Source 
This reverts commit c7535e38dc.
This commit is contained in:
Anthony Calosa
2015-10-19 10:19:14 +08:00
parent 17a2d9b4d8
commit f90775153c
5 changed files with 8 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameObserver.cpp
+7 -17
View File
@@ -593,25 +593,15 @@ void GameObserver::gameStateBasedEffects()
/////////////////////////////////////
for (int d = 0; d < 2; d++)
{
MTGGameZone * dzones[] = { players[d]->game->inPlay, players[d]->game->graveyard, players[d]->game->hand, players[d]->game->library };
for (int k = 0; k < 4; k++)
{
MTGGameZone * zone = dzones[k];
if (mLayers->stackLayer()->count(0, NOT_RESOLVED) == 0)
MTGGameZone * zone = players[d]->game->inPlay;
if (mLayers->stackLayer()->count(0, NOT_RESOLVED) == 0)
{
for (int c = zone->nb_cards - 1; c >= 0; c--)
{
for (int c = zone->nb_cards - 1; c >= 0; c--)
{
zone->cards[c]->cardistargetted = 0;
zone->cards[c]->cardistargetter = 0;
}
zone->cards[c]->cardistargetted = 0;
zone->cards[c]->cardistargetter = 0;
}
//clear trigger
for (int b = zone->nb_cards - 1; b >= 0; b--)
{
zone->cards[b]->controllerTrigger = 0;
zone->cards[b]->opponentTrigger = 0;
}
}//check for losers if its gameover call the statebased action
}
players[d]->DeadLifeState();
}
////////////////////////////////////
projects/mtg/src/MTGAbility.cpp
-14
View File
@@ -411,20 +411,6 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
}
}
check = restriction[i].find("opponenttrigger");
if(check != string::npos)
{
if(!card->opponentTrigger)
return 0;
}
check = restriction[i].find("controllertrigger");
if(check != string::npos)
{
if(!card->controllerTrigger)
return 0;
}
check = restriction[i].find("discarded");
if(check != string::npos)
{
projects/mtg/src/MTGCardInstance.cpp
-2
View File
@@ -65,8 +65,6 @@ MTGCardInstance::MTGCardInstance(MTGCard * card, MTGPlayerCards * arg_belongs_to
LKItoughness = toughness;
cardistargetted = 0;
cardistargetter = 0;
opponentTrigger = 0;
controllerTrigger = 0;
}
MTGCardInstance * MTGCardInstance::createSnapShot()