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

lastController defined when creating copies of itself

Browse Source
This commit is contained in:
Anthony Calosa
2016-06-30 14:06:21 +08:00
parent 76bb777f4d
commit e6aafbc8a6
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/src/AllAbilities.cpp
View File

@@ -1208,7 +1208,7 @@ AACascade::AACascade(GameObserver* observer, int _id, MTGCardInstance * _source,
void AACascade::toCastCard(MTGCardInstance * thisCard)
{
MTGAbility *ac = NEW AACastCard(game, game->mLayers->actionLayer()->getMaxId(), thisCard, thisCard,false,false,true,"","",false,false);
MayAbility *ma1 = NEW MayAbility(game, game->mLayers->actionLayer()->getMaxId(), ac->clone(), thisCard->clone(),true);
MayAbility *ma1 = NEW MayAbility(game, game->mLayers->actionLayer()->getMaxId(), ac->clone(), thisCard,true);
MTGAbility *ga1 = NEW GenericAddToGame(game, game->mLayers->actionLayer()->getMaxId(), thisCard,NULL,ma1->clone());
SAFE_DELETE(ac);
SAFE_DELETE(ma1);

1
projects/mtg/src/MTGAbility.cpp
View File

@@ -2802,7 +2802,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
vector<string> splitCascade = parseBetween(s, "cascade:", " ", false);
if (splitCascade.size())
{
Targetable * t = spell ? spell->getNextTarget() : NULL;
MTGAbility * a = NEW AACascade(observer, id, card, target, splitCascade[1], NULL);
a->oneShot = 1;
return a;

2
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -611,8 +611,6 @@ MTGCardInstance * MTGCardInstance::changeController(Player * newController,bool
Player * MTGCardInstance::controller()
{
if(!lastController)//if null then set the owner as the lastcontroller, prevents crashes...
lastController = owner;
return lastController;
}

1
projects/mtg/src/MTGGameZones.cpp
View File

@@ -564,6 +564,7 @@ MTGCardInstance * MTGGameZone::removeCard(MTGCardInstance * card, int createCopy
copy->kicked = card->kicked;
copy->storedCard = card->storedCard;
copy->storedSourceCard = card->storedSourceCard;
copy->lastController = card->controller();
for (int i = 0; i < ManaCost::MANA_PAID_WITH_OVERLOAD +1; i++)
copy->alternateCostPaid[i] = card->alternateCostPaid[i];