1 files changed, 8 insertions, 15 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/State.java b/core/src/ch/asynk/rustanddust/game/State.java
index a3a6fec..9ab1576 100644
--- a/core/src/ch/asynk/rustanddust/game/State.java
+++ b/core/src/ch/asynk/rustanddust/game/State.java
@@ -1,32 +1,25 @@
 package ch.asynk.rustanddust.game;
 
+import ch.asynk.rustanddust.game.Ctrl.MsgType;
+
 public interface State
 {
-    enum StateType {
-        LOADING,
+    enum StateType
+    {
         REPLAY,
+        WAIT_EVENT,
         SELECT,
         MOVE,
-        ROTATE,
         ENGAGE,
-        BREAK,
         PROMOTE,
         ANIMATION,
         REINFORCEMENT,
         DEPLOYMENT,
-        WITHDRAW,
-        ABORT,
-        DONE,
-        TURN_OVER
     };
 
-    public void enterFrom(StateType prevState);
-
-    public void leaveFor(StateType nextState);
-
-    public StateType abort();
+    public void touch(Hex hex);
 
-    public StateType execute();
+    public void enterFrom(StateType prevState);
 
-    public void touch(Hex hex);
+    public boolean processMsg(MsgType msg, Object data);
 }