Fix bug with choosing same world in world select screen messing up

the next world. Adjust saturation levels of slime death animation.
UoLCompSoc · Sep 23, 2014 · 5a16476 · 5a16476
1 parent 65ac8c8
commit 5a16476
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/core/assets/monsters/slime_die_desat.png b/core/assets/monsters/slime_die_desat.png
diff --git a/core/src/uk/org/ulcompsoc/tesseract/TesseractMain.java b/core/src/uk/org/ulcompsoc/tesseract/TesseractMain.java
@@ -501,12 +501,16 @@ public void changeToWorld(int diffWorld) {
 		battleChangeFlag = worldChangeFlag = false;
 		Gdx.app.debug("WORLD_CHANGE", "Changing to world " + (diffWorld == -1 ? currentMapIndex : diffWorld) + ".");
 
+		if (diffWorld == currentMapIndex) {
+			diffWorld = -1;
+		}
+
 		if (diffWorld != -1) {
 			if (diffWorld >= maps.length) {
 				diffWorld = diffWorld % maps.length;
 			}
 
-			if (currentMapIndex != -1 && diffWorld != currentMapIndex) {
+			if (currentMapIndex != -1) {
 				worldEngines[currentMapIndex].removeEntity(worldPlayerEntity);
 			}
 
@@ -521,8 +525,9 @@ public void changeToWorld(int diffWorld) {
 
 		if (diffWorld != -1) {
 			worldPlayerEntity.add(getCurrentMap().findPlayerPosition());
-			currentEngine.addEntity(worldPlayerEntity);
 			musicManager.play(currentMapIndex);
+
+			currentEngine.addEntity(worldPlayerEntity);
 		}
 
 		((OrthographicCamera) camera).zoom = 0.5f;