From 6a1591d72baa3a1c8eefb14276f7205399ea4879 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Fri, 1 Feb 2013 18:54:07 +0000 Subject: [PATCH] reverted the newtarget/retarget fix, it didn't fix the issue and created new ones. --- projects/mtg/include/MTGGameZones.h | 2 +- projects/mtg/src/AllAbilities.cpp | 5 ++--- projects/mtg/src/MTGGameZones.cpp | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/projects/mtg/include/MTGGameZones.h b/projects/mtg/include/MTGGameZones.h index ca41e762f..a2fab5992 100644 --- a/projects/mtg/include/MTGGameZones.h +++ b/projects/mtg/include/MTGGameZones.h @@ -208,7 +208,7 @@ public: MTGCardInstance * putInExile(MTGCardInstance * card); MTGCardInstance * putInLibrary(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 isInGrave(MTGCardInstance * card); int isInZone(MTGCardInstance * card,MTGGameZone * zone); diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index 1d5f0d2eb..0c346bdae 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -378,7 +378,6 @@ int AACopier::resolve() if (_target) { source->copy(_target); - source->cardsAbilities; return 1; } return 0; @@ -1552,10 +1551,10 @@ int AANewTarget::resolve() while (_target->next) _target = _target->next; _target->controller()->game->putInZone(_target, _target->currentZone, - _target->owner->game->exile,false); + _target->owner->game->exile); _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); if(reUp->source->hasSubtype(Subtypes::TYPE_AURA)) { diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 3a4db53e5..8cec220ab 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -303,7 +303,7 @@ MTGCardInstance * MTGPlayerCards::putInHand(MTGCardInstance * card) // Moves a card from one zone to another // 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; GameObserver *g = owner->getObserver(); @@ -369,11 +369,8 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone SAFE_DELETE(previous); } } - if(sendEvent) - { WEvent * e = NEW WEventZoneChange(copy, from, to); g->receiveEvent(e); - } return ret; }