Merge remote-tracking branch 'refs/remotes/WagicProject/master'

projects/mtg/include/GameObserver.h

@@ -81,6 +81,7 @@ class GameObserver{
   int oldGamePhase;
   TargetChooser * targetChooser;
   CardDisplay * OpenedDisplay;
+  GuiGameZone * guiOpenDisplay;
   DuelLayers * mLayers;
   ReplacementEffects *replacementEffects;
   vector<Player *> players; //created outside

projects/mtg/src/GameObserver.cpp

@@ -98,6 +98,7 @@ GameObserver::GameObserver(WResourceManager *output, JGE* input)
     cardWaitingForTargets = NULL;
     mExtraPayment = NULL;
 	OpenedDisplay = NULL;
+    guiOpenDisplay = NULL;
     gameOver = NULL;
     phaseRing = NULL;
     replacementEffects = NEW ReplacementEffects();

projects/mtg/src/GuiStatic.cpp

@@ -151,11 +151,13 @@ void GuiGameZone::toggleDisplay()
 {
 	if (showCards)
 	{
+        cd->zone->owner->getObserver()->guiOpenDisplay = NULL;
 		showCards = 0;
 		cd->zone->owner->getObserver()->OpenedDisplay = NULL;
 	}
     else if(!cd->zone->owner->getObserver()->OpenedDisplay)//one display at a time please.
     {
+        cd->zone->owner->getObserver()->guiOpenDisplay = this;
         showCards = 1;
         cd->init(zone);
 		cd->zone->owner->getObserver()->OpenedDisplay = cd;

projects/mtg/src/MTGGameZones.cpp

@@ -363,6 +363,16 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
             if (!card->isToken)
                 to = g->players[i]->game->exile;
         }
+
+
+        if (from == g->players[i]->game->library || from == g->players[i]->game->graveyard || from == g->players[i]->game->exile)
+        {
+            if (g->guiOpenDisplay)
+            {
+                g->ButtonPressed(g->guiOpenDisplay);
+            }
+        }
+
     }
 	//all cards that go from the hand to the graveyard is ALWAYS a discard.
 	if ((to == g->players[0]->game->graveyard || to == g->players[1]->game->graveyard) && (from == g->players[0]->game->hand || from
@@ -370,6 +380,7 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
 	{
 		card->discarded = true;
 	}
+
     //When a card is moved from inPlay to inPlay (controller change, for example), it is still the same object
     if ((to == g->players[0]->game->inPlay || to == g->players[1]->game->inPlay) && (from == g->players[0]->game->inPlay || from
                     == g->players[1]->game->inPlay))

projects/mtg/src/MTGRules.cpp

@@ -2774,11 +2774,9 @@ WEvent * MTGDredgeRule::replace(WEvent * event)
             Player * p = game->players[i];
             if (e->player == p)
             {
+                int Dredgers = 0;
                 for(int draw = 0;draw < e->nb_cards;draw++)
                 {
-                    tcb = tf.createTargetChooser("dredgeable",card);
-                    tcb->targetter = NULL;
-
                     vector<MTGAbility*>selection;
                     //look for other draw replacement effects
                     list<ReplacementEffect *>::iterator it;
@@ -2802,13 +2800,20 @@ WEvent * MTGDredgeRule::replace(WEvent * event)
                         }
                     }
 
-                    //there is a memleak here that i have no idea what causes it.
+                    //there is a memleak here that i have no idea what causes it. got it reduced to just 4 bytes but its still bothering me.
+                    if (Dredgers < e->nb_cards)
+                    {
+                        tcb = tf.createTargetChooser("dredgeable", card);
+                        tcb->targetter = NULL;
+
                         dredgeAbility = NEW dredgeCard(game, game->mLayers->actionLayer()->getMaxId(), card, NULL);
                         dredgeAbility->oneShot = true;
+                        dredgeAbility->canBeInterrupted = false;
                         targetAbility = NEW GenericTargetAbility(game, "Dredge A Card", "", game->mLayers->actionLayer()->getMaxId(), card, tcb->clone(), dredgeAbility->clone());
-                    targetAbility->oneShot = true;
+                        SAFE_DELETE(tcb);
                         SAFE_DELETE(dredgeAbility);
-
+                        targetAbility->oneShot = true;
+                        targetAbility->canBeInterrupted = false;
                         targetAbilityAdder = NEW GenericAddToGame(game, game->mLayers->actionLayer()->getMaxId(), card, NULL, targetAbility->clone());
                         targetAbilityAdder->oneShot = true;
                         SAFE_DELETE(targetAbility);
@@ -2818,11 +2823,13 @@ WEvent * MTGDredgeRule::replace(WEvent * event)
 
                         selection.push_back(setDredge);
                         targetAbility1 = NEW AADrawer(game, this->GetId(), card, card, NULL, "1", TargetChooser::CONTROLLER, true);
+                        targetAbility1->canBeInterrupted = false;
                         selection.push_back(targetAbility1);
                         MTGAbility * menuChoice = NEW MenuAbility(game, this->GetId(), card, card, true, selection, card->controller(), "Dredge or Draw");
 
                         menuChoice->addToGame();
-                    SAFE_DELETE(tcb);
+
+                    }
                 }
                 
                 SAFE_DELETE(event);