OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Bugfix: do not reset NPCs on current map when resting.

Browse Source
This commit is contained in:
Oskar Wiksten
2012-08-29 14:52:45 +00:00
parent bb55f075bf
commit 628367f773
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
View File

@@ -67,9 +67,9 @@ public final class Controller {
if (lostExp < 0) lostExp = 0;
player.addExperience(-lostExp);
model.statistics.addPlayerDeath(lostExp);
playerRested(world, null);
final MainActivity act = view.mainActivity;
MovementController.respawnPlayer(act.getResources(), world);
playerRested(world, null);
act.updateStatus();
act.mainview.notifyMapChanged(world.model);
act.message(act.getResources().getString(R.string.combat_hero_dies, lostExp));
@@ -86,6 +86,9 @@ public final class Controller {
player.spawnMap = world.model.currentMap.name;
}
resetMaps(world, false, true);
if (area != null) {
world.model.currentMap.spawnAll(world);
}
}
public static void ui_playerRested(final Activity currentActivity, final ViewContext viewContext, MapObject area) {