Bugfix: Make sure that all areas are respawned on the map where the player ends up...

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
index 72acf57acc7a0e74e0f01354a5ab738c417bb79b..bbb81376830ae1aa3f9ad682bd10a23702ad575d 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
@@ -148,8 +148,8 @@ public final class WorldSetup {
                Context ctx = androidContext.get();
                world.model = new ModelContainer();
                world.model.player.initializeNewPlayer(world.itemTypes, world.dropLists, newHeroName);
-               Controller.playerRested(world, null);
                MovementController.respawnPlayer(ctx.getResources(), world);
+               Controller.playerRested(world, null);
        }
 
 

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
index 9718d1d6d8c782d9cd6326d676a00c038cfef8bc..2ef3f2f9930fc465256e43518764e522685cd612 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
@@ -88,9 +88,7 @@ public final class Controller {
                for (PredefinedMap m : world.maps.predefinedMaps) {
                        m.resetTemporaryData();
        }
-               if (area != null) {
-                       world.model.currentMap.spawnAll(world);
-               }
+               world.model.currentMap.spawnAll(world);
        }
 
        public static void ui_playerRested(final Activity currentActivity, final ViewContext viewContext, MapObject area) {