From f6b1455d5f4e2bd302dce15ea3c7c49d6fd3b7de Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sat, 15 Sep 2012 09:28:25 +0200 Subject: [PATCH] Bugfix: Make sure that all areas are respawned on the map where the player ends up on after getting killed. --- AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java | 2 +- .../src/com/gpl/rpg/AndorsTrail/controller/Controller.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java index 72acf57ac..bbb813768 100644 --- 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 9718d1d6d..2ef3f2f99 100644 --- 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) {