2 files changed, 9 insertions, 18 deletions

@@ -5,6 +5,9 @@
 
 package com.fourisland.fourpuzzle;
 
+import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.BlankEventGraphic;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.EventGraphic;
+
 /**
  *
  * @author hatkirby
@@ -45,24 +48,14 @@ public class GameCharacter {
         this.inParty = inParty;
     }
     
-    private String graphic = "blank";
-    public String getGraphic()
+    private EventGraphic graphic = new BlankEventGraphic();
+    public EventGraphic getGraphic()
     {
         return graphic;
     }
-    public void setGraphic(String graphic)
+    public void setGraphic(EventGraphic graphic)
     {
         this.graphic = graphic;
     }
-
-    private int graphicOffset = 0;
-    public int getGraphicOffset()
-    {
-        return graphicOffset;
-    }
-    public void setGraphicOffset(int graphicOffset)
-    {
-        this.graphicOffset = graphicOffset;
-    }
     
 }
@@ -66,14 +66,12 @@ public class HeroEvent implements Event {
             }
         }
         
-        /* TODO Change the specification of GameCharacter
-         * to require an EventGraphic instead of a graphic name
-         * and offset
-         */
         GameCharacter toDraw = Game.getSaveFile().getParty().getLeader();
         if (!toDraw.getGraphic().equals("blank"))
         {
-            g.drawImage(CharSet.getCharSet(toDraw.getGraphic()).getImage(toDraw.getGraphicOffset(), direction, animationStep), x, y, null);
+            toDraw.getGraphic().setDirection(direction);
+            toDraw.getGraphic().setAnimationStep(animationStep);
+            g.drawImage(toDraw.getGraphic().getImage(), x, y, null);
         }
     }