Erwan

- fix for issue 462 (graphical glitch when cards come back from graveyard)
- adding Kaioshin's wallpaper
- fixed minor issue in mtg.txt

projects/mtg/bin/Res/graphics/wallpapers.txt

@@ -7,3 +7,4 @@ wallpapers/kaioshin_jace.jpg
 graphics/shop.jpg
 themes/Classic/backdrop.jpg
 themes/Jade/backdrop.jpg
+wallpapers/kaioshin_ravager.jpg

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -4855,8 +4855,7 @@ type=Artifact
 name=Black Market
 auto=@movedTo(creature|graveyard) from(battlefield):counter(0/0,1,Charge)
 auto=@each my firstmain:thisforeach(counter{0/0.1.Charge}) add{B} controller
-text=Whenever a creature 
+text=Whenever a creature is put into a graveyard from the battlefield, put a charge counter on Black Market. -- At the beginning of your precombat main phase, add Black to your mana pool for each charge counter on Black Market.
-, put a charge counter on Black Market. -- At the beginning of your precombat main phase, add Black to your mana pool for each charge counter on Black Market.
 mana={3}{B}{B}
 type=Enchantment
 [/card]

projects/mtg/bin/Res/test/_tests.txt

@@ -212,7 +212,6 @@ drain_life.txt
 dream_fracture_i142.txt
 drift_of_the_dead.txt
 dromad_purebred.txt
-dross_golem.txt
 dross_harvester.txt
 duskwalker.txt
 dust_corona.txt
@@ -312,7 +311,6 @@ juniper_order_ranger.txt
 karns_touch_i233.txt
 keldon_warlord.txt
 keldon_warlord2.txt
-khalni_hydra.txt
 kird_ape.txt
 kjeldoran_frostbeast1.txt
 kjeldoran_frostbeast2_i167.txt
@@ -349,7 +347,6 @@ maze_of_ith.txt
 meekstone.txt
 memnarch.txt
 memory_erosion.txt
-mephidross_vampire.txt
 millstone.txt
 mirri_the_cursed.txt
 mirri_the_cursed2_i284.txt
@@ -396,7 +393,6 @@ rampant_growth.txt
 rancor.txt
 ray_of_command.txt
 ray_of_command_i176.txt
-razor_golem.txt
 reclusive_wight.txt
 reclusive_wight2.txt
 recover.txt

projects/mtg/src/GuiHand.cpp

@@ -201,19 +201,25 @@ float GuiHandSelf::LeftBoundary()
 
 int GuiHandSelf::receiveEventPlus(WEvent* e)
 {
-  if (WEventZoneChange* event = dynamic_cast<WEventZoneChange*>(e))
+  if (WEventZoneChange* ev = dynamic_cast<WEventZoneChange*>(e))
-    if (hand == event->to)
+    if (hand == ev->to)
       {
-	CardView* card;
+	      CardView* card;
-	if (event->card->view)
+        if (ev->card->view) {
-	  card = NEW CardView(CardSelector::handZone, event->card, *(event->card->view));
+
-	else
+          //fix for http://code.google.com/p/wagic/issues/detail?id=462. 
-	  card = NEW CardView(CardSelector::handZone, event->card, ClosedRowX, 0);
+          // We don't want a card in the hand to have an alpha of 0
-	card->t = 6*M_PI;
+          ev->card->view->alpha = 255; 
-	cards.push_back(card);
+
-	cs->Add(card);
+	        card = NEW CardView(CardSelector::handZone, ev->card, *(ev->card->view));
-        Repos();
+        }
-	return 1;
+	      else
+	        card = NEW CardView(CardSelector::handZone, ev->card, ClosedRowX, 0);
+	      card->t = 6*M_PI;
+	      cards.push_back(card);
+	      cs->Add(card);
+              Repos();
+	      return 1;
       }
   return 0;
 }

projects/mtg/src/GuiPlay.cpp

@@ -226,8 +226,13 @@ int GuiPlay::receiveEventPlus(WEvent * e)
 	  (game->players[1]->inPlay() == event->to))
 	{
 	  CardView * card;
-	  if (event->card->view)
+    if (event->card->view){
+      //fix for http://code.google.com/p/wagic/issues/detail?id=462. 
+      // We don't want a card in the hand to have an alpha of 0
+      event->card->view->alpha = 255; 
+
 	    card = NEW CardView(CardSelector::playZone, event->card, *(event->card->view));
+    }
 	  else
 	    card = NEW CardView(CardSelector::playZone, event->card, 0, 0);
 	  cards.push_back(card);