Fix bug when loading game. Wrong assetState.

Author: bladecoder

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

@@ -608,8 +608,6 @@ public void loadChapter(String chapterName) throws IOException {
 
 		init();
 
-		assetState = AssetState.LOAD_ASSETS;
-
 		long initTime = System.currentTimeMillis();
 
 		SerializationHelper.getInstance().setMode(Mode.MODEL);
@@ -685,10 +683,6 @@ public void loadGameState(FileHandle savedFile) throws IOException {
 		init();
 
 		if (savedFile.exists()) {
-			assetState = AssetState.LOAD_ASSETS;
-
-			// new Json().fromJson(World.class, savedFile.reader("UTF-8"));
-
 			SerializationHelper.getInstance().setMode(Mode.STATE);
 
 			JsonValue root = new JsonReader().parse(savedFile.reader("UTF-8"));
@@ -697,6 +691,8 @@ public void loadGameState(FileHandle savedFile) throws IOException {
 			json.setIgnoreUnknownFields(true);
 
 			read(json, root);
+			
+			assetState = AssetState.LOAD_ASSETS;
 
 		} else {
 			throw new IOException("LOADGAMESTATE: no saved game exists");