Bugfix: Populate the combat view correctly when loading games where the player has...

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
index b940ff6e4c02dbadebd680fc77c181f5634cd4fb..8af46184dc3a57eda16fab30dac067026508f440 100644 (file)
--- 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);