diff --git a/AndorsTrail/res/layout/shoplist.xml b/AndorsTrail/res/layout/shoplist.xml index 13e880ad7..5f6e93784 100644 --- a/AndorsTrail/res/layout/shoplist.xml +++ b/AndorsTrail/res/layout/shoplist.xml @@ -37,6 +37,7 @@ + android:layout_height="wrap_content" + /> diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java index dcdbc40b5..3493c86f8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java @@ -88,9 +88,9 @@ public final class SkillInfo { private int getRequirementActualValue(Player player) { switch (requirementType) { - case skillLevel: return player.getSkillLevel(SkillCollection.SkillID.valueOf(skillOrStatID)); - case experienceLevel: return player.getLevel(); - case playerStat: return player.getStatValue(Player.StatID.valueOf(skillOrStatID)); + case skillLevel: return player.getSkillLevel(SkillCollection.SkillID.valueOf(skillOrStatID)); + case experienceLevel: return player.getLevel(); + case playerStat: return player.getStatValue(Player.StatID.valueOf(skillOrStatID)); default: return 0; } } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java index 32b7e6446..e47c7459a 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java @@ -96,7 +96,7 @@ public final class Inventory extends ItemContainer { if (i == null) break; if (i.itemType.isQuestItem()) questItems.items.add(i); - } + } return questItems; } // Move to item container?