Engine: Restricted LayerEvent moving

Now, LayerEvents can only move if their current PossibleEvent has a MoveableEventGraphic.

3 files changed, 27 insertions, 1 deletions

@@ -10,6 +10,7 @@ import java.awt.Graphics;
 import java.util.ArrayList;
 import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.BlankEventGraphic;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.MoveableEventGraphic;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.precondition.Precondition;
 
 /**
@@ -94,6 +95,17 @@ public class LayerEvent extends AbstractEvent implements Event {
         }
     }
     
+    @Override
+    public boolean startMoving(Direction toMove)
+    {
+        if (!(getPossibleEvent().getGraphic() instanceof MoveableEventGraphic))
+        {
+            return false;
+        }
+        
+        return super.startMoving(toMove);
+    }
+    
     public Direction getDirection()
     {
         return getPossibleEvent().getDirection();
@@ -14,7 +14,7 @@ import java.awt.image.BufferedImage;
  *
  * @author hatkirby
  */
-public class CharSetEventGraphic implements EventGraphic {
+public class CharSetEventGraphic implements MoveableEventGraphic {
     
     private Direction direction = Direction.South;
     private int animationStep = 1;
@@ -0,0 +1,14 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.fourisland.fourpuzzle.gamestate.mapview.event.graphic;
+
+/**
+ *
+ * @author hatkirby
+ */
+public interface MoveableEventGraphic extends EventGraphic {
+
+}