Erwan

- display the thumbnail as a "shadow" over the text version of the card if the big picture is not available
- fixed a bug with circles of protection, although graphically it is difficult to understand what's going on when using those cards
- fixed a bug with a card in Ice age

projects/mtg/include/ActionStack.h

@@ -53,6 +53,9 @@ class Interruptible: public PlayGuiObject, public Targetable{
   virtual void Render(){};
   int typeAsTarget(){return TARGET_STACKACTION;};
  Interruptible(int id,bool hasFocus = false):PlayGuiObject(id,40,x,y,hasFocus){state=NOT_RESOLVED;display=0;source=NULL;};
+#if defined (WIN32) || defined (LINUX)
+  virtual void Dump();
+#endif
 };
 
 class NextGamePhase: public Interruptible {
@@ -142,6 +145,10 @@ class ActionStack :public GuiLayer{
   int CombatDamages();
   int CombatDamages(int firststrike);
   int has(Interruptible * action);
+#if defined (WIN32) || defined (LINUX)
+   void Dump();
+#endif
+
 };
 
 

projects/mtg/include/Damage.h

@@ -31,7 +31,6 @@ class Damage: public Interruptible {
   void init(MTGCardInstance * _source, Damageable * _target, int _damage);
  public:
   Damageable * target;
-  MTGCardInstance * source;
   int damage;
   void Render();
   Damage(int id, MTGCardInstance* _source, Damageable * _target);

projects/mtg/include/GameStateDeckViewer.h

@@ -615,13 +615,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
 
     int alpha = (int) (255 * (scale + 1.0 - max_scale));
 
-    if (!card){
-      /*int scaleBackup = mFont->GetScale();
-	mFont->SetScale(scale);
-	mFont->DrawString("empty slot", x, y);
-	mFont->SetScale(scaleBackup);*/
-      return;
-    }
+    if (!card) return;
     JQuad * quad = backQuad;
 
     int showName = 1;
@@ -648,6 +642,12 @@ class GameStateDeckViewer: public GameState, public JGuiListener
       }
     }else{
       CardGui::alternateRender(card, mFont, mIcons, x_center, y + 142.5*scale, 0, scale);
+      quad = card->getThumb();
+      if (quad){
+         float _scale = 285 * scale / quad->mHeight;
+         quad->SetColor(ARGB(40,255,255,255));
+         JRenderer::GetInstance()->RenderQuad(quad,x,y,0,_scale,_scale);
+      }
     }
     if (last_user_activity < 3){
       int fontAlpha = alpha;