From da6aacde5adb88b6cf6eb6233840855b793efe61 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Mon, 11 Jun 2012 20:02:47 +0200 Subject: [PATCH] Bugfix: Populate the combat view correctly when loading games where the player has selected a movement destination in battle. --- AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java index b940ff6..8af4618 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java @@ -110,7 +110,7 @@ public final class CombatView extends RelativeLayout { statusTextView.setText(res.getString(R.string.combat_status_ap, range.current)); } public void updateCombatSelection(Monster selectedMonster, Coord selectedMovePosition) { - if (currentMonster == selectedMonster) return; + if (currentMonster != null && currentMonster == selectedMonster) return; attackMoveButton.setEnabled(true); monsterBar.setVisibility(View.INVISIBLE); -- 2.49.0