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

reverted the newtarget/retarget fix, it didn't fix the issue and created new ones.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2013-02-01 18:54:07 +00:00
parent fa5e3ad9b4
commit 6a1591d72b
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/MTGGameZones.h
+1 -1
View File
@@ -208,7 +208,7 @@ public:
MTGCardInstance * putInExile(MTGCardInstance * card); MTGCardInstance * putInExile(MTGCardInstance * card);
MTGCardInstance * putInLibrary(MTGCardInstance * card); MTGCardInstance * putInLibrary(MTGCardInstance * card);
MTGCardInstance * putInHand(MTGCardInstance * card); MTGCardInstance * putInHand(MTGCardInstance * card);
MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to,bool sendEvent = true); MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to);
int isInPlay(MTGCardInstance * card); int isInPlay(MTGCardInstance * card);
int isInGrave(MTGCardInstance * card); int isInGrave(MTGCardInstance * card);
int isInZone(MTGCardInstance * card,MTGGameZone * zone); int isInZone(MTGCardInstance * card,MTGGameZone * zone);
projects/mtg/src/AllAbilities.cpp
+2 -3
View File
@@ -378,7 +378,6 @@ int AACopier::resolve()
if (_target) if (_target)
{ {
source->copy(_target); source->copy(_target);
source->cardsAbilities;
return 1; return 1;
} }
return 0; return 0;
@@ -1552,10 +1551,10 @@ int AANewTarget::resolve()
while (_target->next) while (_target->next)
_target = _target->next; _target = _target->next;
_target->controller()->game->putInZone(_target, _target->currentZone, _target->controller()->game->putInZone(_target, _target->currentZone,
_target->owner->game->exile,false); _target->owner->game->exile);
_target = _target->next; _target = _target->next;
MTGCardInstance * refreshed = source->controller()->game->putInZone(_target,_target->currentZone,source->controller()->game->battlefield,false); MTGCardInstance * refreshed = source->controller()->game->putInZone(_target,_target->currentZone,source->controller()->game->battlefield);
Spell * reUp = NEW Spell(game, refreshed); Spell * reUp = NEW Spell(game, refreshed);
if(reUp->source->hasSubtype(Subtypes::TYPE_AURA)) if(reUp->source->hasSubtype(Subtypes::TYPE_AURA))
{ {
projects/mtg/src/MTGGameZones.cpp
+1 -4
View File
@@ -303,7 +303,7 @@ MTGCardInstance * MTGPlayerCards::putInHand(MTGCardInstance * card)
// Moves a card from one zone to another // Moves a card from one zone to another
// If the card is not actually in the expected "from" zone, does nothing and returns null // If the card is not actually in the expected "from" zone, does nothing and returns null
MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to,bool sendEvent) MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to)
{ {
MTGCardInstance * copy = NULL; MTGCardInstance * copy = NULL;
GameObserver *g = owner->getObserver(); GameObserver *g = owner->getObserver();
@@ -369,11 +369,8 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
SAFE_DELETE(previous); SAFE_DELETE(previous);
} }
} }
if(sendEvent)
{
WEvent * e = NEW WEventZoneChange(copy, from, to); WEvent * e = NEW WEventZoneChange(copy, from, to);
g->receiveEvent(e); g->receiveEvent(e);
}
return ret; return ret;
} }