5 files changed, 5 insertions, 6 deletions
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java
index 4f8b51c..f42cdf0 100644
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/LayerEvent.java

@@ -134,7 +134,7 @@ public class LayerEvent implements Event {
    private Direction moveDirection;
    public void startMoving(Map map)
    {
-        Direction toMove = getPossibleEvent().getMovement().startMoving();
+        Direction toMove = getPossibleEvent().getMovement().nextMovement();
        
        if (toMove != null)
        {
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java
index 5a82f91..f8f9719 100644
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/CustomMovementType.java

@@ -21,7 +21,7 @@ public class CustomMovementType implements MovementType {
        this.moves = moves;
    }
    
-    public Direction startMoving()
+    public Direction nextMovement()
    {        
        if (step >= moves.length)
        {
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java
index 7b9ee0c..78309ae 100644
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/MovementType.java

@@ -13,8 +13,7 @@ import com.fourisland.fourpuzzle.Direction;
 */
 public interface MovementType {
    
-    // TODO Rename the following method to getNextDirection
+    public Direction nextMovement();
-    public Direction startMoving();
    
 }
    
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java
index b714ced..df93c6f 100644
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/RandomMovementType.java

@@ -14,7 +14,7 @@ import java.util.Random;
 */
 public class RandomMovementType implements MovementType {
-    public Direction startMoving()
+    public Direction nextMovement()
    {
        Random r = new Random();
        int ra = r.nextInt(1000);
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java
index 1f2a49c..2526f0f 100644
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/movement/StayStillMovementType.java

@@ -13,7 +13,7 @@ import com.fourisland.fourpuzzle.Direction;
 */
 public class StayStillMovementType implements MovementType {
-    public Direction startMoving()
+    public Direction nextMovement()
    {
        return null; // Do nothing, stay still
    }