From c1e24d60439b5dc7d4cfdf2dd4e35addc2ec7bd5 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 8 Mar 2014 05:43:39 +0000
Subject: [PATCH] Make card images show up

---
 forge-m-base/src/forge/assets/ImageCache.java  |  4 ++--
 forge-m-base/src/forge/toolbox/FCardPanel.java | 13 ++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/forge-m-base/src/forge/assets/ImageCache.java b/forge-m-base/src/forge/assets/ImageCache.java
index d3bf397698e..9c06e2e965a 100644
--- a/forge-m-base/src/forge/assets/ImageCache.java
+++ b/forge-m-base/src/forge/assets/ImageCache.java
@@ -62,9 +62,9 @@ public class ImageCache {
     private static final LoadingCache<String, Texture> _CACHE = CacheBuilder.newBuilder().softValues().build(new ImageLoader());
     private static final Texture _defaultImage;
     static {
-        Texture defImage = new Texture(Gdx.files.internal(Constants.DEFAULT_DUELS_DIR));
+        Texture defImage = null;
         try {
-            defImage = new Texture(Gdx.files.internal(Constants.DEFAULT_DUELS_DIR));
+            defImage = new Texture(Gdx.files.internal(Constants.NO_CARD_FILE));
         } catch (Exception ex) {
             System.err.println("could not load default card image");
         } finally {
diff --git a/forge-m-base/src/forge/toolbox/FCardPanel.java b/forge-m-base/src/forge/toolbox/FCardPanel.java
index c6e0014a36a..4345b253795 100644
--- a/forge-m-base/src/forge/toolbox/FCardPanel.java
+++ b/forge-m-base/src/forge/toolbox/FCardPanel.java
@@ -1,8 +1,7 @@
 package forge.toolbox;
 
-import com.badlogic.gdx.graphics.Color;
-
 import forge.Forge.Graphics;
+import forge.assets.ImageCache;
 import forge.game.card.Card;
 
 public class FCardPanel extends FDisplayObject {
@@ -25,14 +24,6 @@ public class FCardPanel extends FDisplayObject {
             w = h / ASPECT_RATIO;
         }
 
-        if (card.isCreature()) { //TODO: Render actual card image
-            g.fillRect(Color.BLUE, x, y, w, h);
-        }
-        else if (card.isLand()) {
-            g.fillRect(Color.GREEN, x, y, w, h);
-        }
-        else {
-            g.fillRect(Color.RED, x, y, w, h);
-        }
+        g.drawImage(ImageCache.getImage(card), x, y, w, h);
     }
 }