fix: stop processing ActionCallbackQueue when changing scene

(LeaveAction)

Author: bladecoder

blade-engine/src/com/bladecoder/engine/actions/ActionCallbackQueue.java

@@ -20,6 +20,8 @@
 
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.ActionCallbackSerialization;
 
 /**
@@ -50,8 +52,15 @@ public static void run() {
 			runQueue.addAll(queue);				
 			queue.clear();
 
-			for(ActionCallback cb: runQueue)
+			// TOFIX Quick hack to stop processing when changing scene
+			Scene scn = World.getInstance().getCurrentScene();
+			
+			for(ActionCallback cb: runQueue) {
 				cb.resume();
+								
+				if(scn != World.getInstance().getCurrentScene())
+					break;
+			}
 
 			runQueue.clear();
 		}

blade-engine/src/com/bladecoder/engine/actions/LeaveAction.java

@@ -21,7 +21,7 @@
 import com.bladecoder.engine.model.World;
 
 
-public class LeaveAction implements Action {
+public class LeaveAction implements Action, ActionCallback {
 	public static final String INFO = "Change the current scene.";
 	public static final Param[] PARAMS = {
 		new Param("scene", "The target scene", Type.SCENE, true),
@@ -32,10 +32,16 @@ public class LeaveAction implements Action {
 	@Override
 	public boolean run(ActionCallback cb) {
 
-		World.getInstance().setCurrentScene(scene);
+		// Queue the setCurrentScene to execute at the end of world update
+		ActionCallbackQueue.add(this);
 
 		return false;
 	}
+	
+	@Override
+	public void resume() {
+		World.getInstance().setCurrentScene(scene);
+	}
 
 	@Override
 	public void setParams(HashMap<String, String> params) {

blade-engine/src/com/bladecoder/engine/model/World.java

@@ -208,12 +208,6 @@ public void update(float delta) {
 			return;
 
 		timeOfGame += delta;
-
-		ActionCallbackQueue.run();
-		
-		// Check because the ActionCallbackQueue can call to setCurrentScene()
-		if (assetState != AssetState.LOADED)
-			return;
 
 		getCurrentScene().update(delta);
 		textManager.update(delta);
@@ -222,6 +216,8 @@ public void update(float delta) {
 		if (!transition.isFinish()) {
 			transition.update(delta);
 		}
+		
+		ActionCallbackQueue.run();
 	}
 
 	@Override