10 files changed, 46 insertions, 37 deletions

diff --git a/src/esieequest/engine/GameEngine.java b/src/esieequest/engine/GameEngine.java
index 8c1ac95..573d3a8 100644
--- a/src/esieequest/engine/GameEngine.java
+++ b/src/esieequest/engine/GameEngine.java
@@ -7,6 +7,7 @@ import esieequest.game.characters.MovingCharacter;
 import esieequest.game.items.Beamer;
 import esieequest.game.items.Item;
 import esieequest.game.map.Room;
+import esieequest.game.states.Callback;
 import esieequest.game.states.Scene;
 import esieequest.ui.Viewable;
 
@@ -104,7 +105,12 @@ public class GameEngine {
                 final boolean trapped = inDeadEnd && !canGoBack && !canTeleport;
 
                 if (trapped) {
-                        this.view.playScene(Scene.GAME_LOST);
+                        this.view.playScene(Scene.GAME_LOST, new Callback() {
+                                @Override
+                                public void call() {
+                                        return;
+                                }
+                        });
                         this.view.echo("You are trapped. You losed.");
                 }
 
diff --git a/src/esieequest/engine/commands/NewCommand.java b/src/esieequest/engine/commands/NewCommand.java
index 49c0225..dea279a 100644
--- a/src/esieequest/engine/commands/NewCommand.java
+++ b/src/esieequest/engine/commands/NewCommand.java
@@ -1,8 +1,8 @@
 package esieequest.engine.commands;
 
-import esieequest.engine.Callback;
 import esieequest.game.Game;
 import esieequest.game.Text;
+import esieequest.game.states.Callback;
 import esieequest.game.states.Scene;
 import esieequest.ui.Viewable;
 
@@ -22,7 +22,7 @@ public class NewCommand implements Executable {
 
                 view.echo(Text.WELCOME.toString());
 
-                Scene.INTRO.setCallback(new Callback() {
+                view.playScene(Scene.INTRO, new Callback() {
                         @Override
                         public void call() {
                                 view.updateQuest(game.getPlayer().getCurrentQuest());
@@ -35,7 +35,5 @@ public class NewCommand implements Executable {
                         }
                 });
 
-                view.playScene(Scene.INTRO);
-
         }
 }
diff --git a/src/esieequest/game/characters/Sumobot.java b/src/esieequest/game/characters/Sumobot.java
index f650c32..5f38e67 100644
--- a/src/esieequest/game/characters/Sumobot.java
+++ b/src/esieequest/game/characters/Sumobot.java
@@ -6,6 +6,7 @@ import esieequest.game.Game;
 import esieequest.game.Text;
 import esieequest.game.map.Direction;
 import esieequest.game.map.Room;
+import esieequest.game.states.Callback;
 import esieequest.game.states.Scene;
 import esieequest.ui.Viewable;
 
@@ -50,7 +51,12 @@ public class Sumobot extends FollowingCharacter {
                         return;
                 }
 
-                view.playScene(Scene.GAME_LOST);
+                view.playScene(Scene.GAME_LOST, new Callback() {
+                        @Override
+                        public void call() {
+                                return;
+                        }
+                });
                 view.echo(this.getRandomMessage() + Text.NEW_LINE + Sumobot.KILLED_MESSAGE);
 
         }
diff --git a/src/esieequest/game/items/Disk.java b/src/esieequest/game/items/Disk.java
index f558956..096aa48 100644
--- a/src/esieequest/game/items/Disk.java
+++ b/src/esieequest/game/items/Disk.java
@@ -1,9 +1,9 @@
 package esieequest.game.items;
 
-import esieequest.engine.Callback;
 import esieequest.game.Game;
 import esieequest.game.map.Direction;
 import esieequest.game.map.Room;
+import esieequest.game.states.Callback;
 import esieequest.game.states.Scene;
 import esieequest.ui.Viewable;
 
@@ -33,20 +33,17 @@ public class Disk extends SimpleItem {
 
                         view.disableInput();
 
-                        Scene.RUN_CONSOLE.setCallback(new Callback() {
+                        view.playScene(Scene.RUN_CONSOLE, new Callback() {
                                 @Override
                                 public void call() {
-                                        Scene.END.setCallback(new Callback() {
+                                        view.playScene(Scene.END, new Callback() {
                                                 @Override
                                                 public void call() {
                                                         view.echo("Congratulations. The simple fact that you are standing here reading this sentence means you made a glorious contribution to science!");
                                                 }
                                         });
-                                        view.playScene(Scene.END);
                                 }
                         });
-
-                        view.playScene(Scene.RUN_CONSOLE);
                 } else {
                         view.echo("Can't use this item here.");
                 }
diff --git a/src/esieequest/engine/Callback.java b/src/esieequest/game/states/Callback.java
index 91d8451..1fc0ebb 100644
--- a/src/esieequest/engine/Callback.java
+++ b/src/esieequest/game/states/Callback.java
@@ -1,4 +1,4 @@
-package esieequest.engine;
+package esieequest.game.states;
 
 /**
  * The Callback interface.
diff --git a/src/esieequest/game/states/Scene.java b/src/esieequest/game/states/Scene.java
index 46d6884..b802e5e 100644
--- a/src/esieequest/game/states/Scene.java
+++ b/src/esieequest/game/states/Scene.java
@@ -1,8 +1,6 @@
 package esieequest.game.states;
 
 import lombok.Getter;
-import lombok.Setter;
-import esieequest.engine.Callback;
 
 /**
  * Represents an animated Scene that can be played.
@@ -31,20 +29,10 @@ public enum Scene {
         @Getter
         private final int duration;
 
-        @Getter
-        @Setter
-        private Callback callback;
-
         Scene(final String title, final String text, final int duration) {
                 this.title = title;
                 this.text = text;
                 this.duration = duration;
-                this.callback = new Callback() {
-                        @Override
-                        public void call() {
-                                return;
-                        }
-                };
         }
 
 }
diff --git a/src/esieequest/ui/Viewable.java b/src/esieequest/ui/Viewable.java
index cc6e091..f45f1aa 100644
--- a/src/esieequest/ui/Viewable.java
+++ b/src/esieequest/ui/Viewable.java
@@ -5,6 +5,7 @@ import esieequest.game.items.Inventory;
 import esieequest.game.map.Direction;
 import esieequest.game.map.Room;
 import esieequest.game.map.Side;
+import esieequest.game.states.Callback;
 import esieequest.game.states.Quest;
 import esieequest.game.states.Scene;
 
@@ -80,8 +81,10 @@ public interface Viewable {
          * 
          * @param scene
          *            the Scene to play
+         * @param callback
+         *            the Callback to call once the scene finished playing
          */
-        public void playScene(final Scene scene);
+        public void playScene(final Scene scene, final Callback callback);
 
         /**