SetActorAttrAction, multiply position by scale

Added check after callbackquee run for scene change

Author: bladecoder

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

@@ -22,6 +22,7 @@
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.actions.Param;
 import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.BaseActor;
 import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engine.model.SceneLayer;
@@ -104,8 +105,10 @@ public boolean run(ActionCallback cb) {
 		}
 
 		if(position != null) {
+			float scale = EngineAssetManager.getInstance().getScale();
+			
 			Vector2 pos = Param.parseVector2(position);
-			actor.setPosition(pos.x, pos.y);
+			actor.setPosition(pos.x * scale, pos.y * scale);
 		}
 
 		if(scale != null) {		

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

@@ -220,7 +220,7 @@ public void startAnimation(String id, int repeatType, int count,
 		faTween.start(this, repeatType, count, currentAnimation.duration, cb);
 	}
 
-	public int getNumFrames() {
+	public int getNumFrames() {		
 		return currentAnimation.regions.size;
 	}
 

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

@@ -210,6 +210,11 @@ public void update(float delta) {
 		timeOfGame += delta;
 
 		ActionCallbackQueue.run();
+		
+		// Check because the ActionCallbackQueue can call to setCurrentScene()
+		if (assetState != AssetState.LOADED)
+			return;
+		
 		getCurrentScene().update(delta);
 		textManager.update(delta);
 		timers.update(delta);