diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java index 0fed16ded..38b812119 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java @@ -308,7 +308,7 @@ public final class MainActivity @Override - public void onPlayerMoved(Coord newPosition, Coord previousPosition) { } + public void onPlayerMoved(PredefinedMap map, Coord newPosition, Coord previousPosition) { } @Override public void onPlayerEnteredNewMap(PredefinedMap map, Coord p) { } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java index 6a95ee8fa..ad71ea402 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java @@ -79,6 +79,9 @@ public final class HeroinfoActivity_Inventory extends Fragment implements Custom public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View v = inflater.inflate(R.layout.heroinfo_inventory, container, false); + AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity()); + if (!app.isInitialized()) return v; + inventoryList = (ListView) v.findViewById(R.id.inventorylist_root); ImageView heroicon = (ImageView) v.findViewById(R.id.heroinfo_inventory_heroicon); heroinfo_stats_gold = (TextView) v.findViewById(R.id.heroinfo_stats_gold); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java index d51d19f72..ece9d03f7 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java @@ -51,7 +51,10 @@ public final class HeroinfoActivity_Quests extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.questlog, container, false); - + + AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity()); + if (!app.isInitialized()) return v; + Context ctx = getActivity(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java index 22bcf6918..6d3a3275e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java @@ -48,7 +48,10 @@ public final class HeroinfoActivity_Skills extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.heroinfo_skill_list, container, false); - + + AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity()); + if (!app.isInitialized()) return v; + final Activity ctx = getActivity(); new SpinnerEmulator(v,R.id.skillList_category_filters_button, R.array.skill_category_filters, R.string.heroinfo_skill_categories) { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java index 088b28e6c..3068e181f 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java @@ -67,10 +67,14 @@ public final class HeroinfoActivity_Stats extends Fragment { View v = inflater.inflate(R.layout.heroinfo_stats, container, false); view = v; + AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity()); + if (!app.isInitialized()) return v; + TextView tv = (TextView) v.findViewById(R.id.heroinfo_title); - tv.setText(player.getName()); - tv.setCompoundDrawablesWithIntrinsicBounds(HeroCollection.getHeroLargeSprite(player.iconID), 0, 0, 0); - + if (tv != null) { + tv.setText(player.getName()); + tv.setCompoundDrawablesWithIntrinsicBounds(HeroCollection.getHeroLargeSprite(player.iconID), 0, 0, 0); + } heroinfo_container = (ViewGroup) v.findViewById(R.id.heroinfo_container); heroinfo_reequip_cost = (TextView) v.findViewById(R.id.heroinfo_reequip_cost); heroinfo_useitem_cost = (TextView) v.findViewById(R.id.heroinfo_useitem_cost); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java index 6695ff0ad..a7d1e67c6 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java @@ -246,7 +246,7 @@ public final class MovementController implements TimedMessageTask.Callback { @Override public void onVisualEffectCompleted(int callbackValue) { - playerMovementListeners.onPlayerMoved(newPosition, player.lastPosition); + playerMovementListeners.onPlayerMoved(currentMap, newPosition, player.lastPosition); controllers.mapController.handleMapEventsAfterMovement(currentMap, newPosition, player.lastPosition); if (!world.model.uiSelections.isInCombat) { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java index ffa475d5d..3f6a53d73 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java @@ -4,6 +4,6 @@ import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.util.Coord; public interface PlayerMovementListener { - void onPlayerMoved(Coord newPosition, Coord previousPosition); + void onPlayerMoved(PredefinedMap map, Coord newPosition, Coord previousPosition); void onPlayerEnteredNewMap(PredefinedMap map, Coord p); } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java index c0a373ba2..739ae13fb 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java @@ -6,8 +6,8 @@ import com.gpl.rpg.AndorsTrail.util.ListOfListeners; public final class PlayerMovementListeners extends ListOfListeners implements PlayerMovementListener { - private final Function2 onPlayerMoved = new Function2() { - @Override public void call(PlayerMovementListener listener, Coord newPosition, Coord previousPosition) { listener.onPlayerMoved(newPosition, previousPosition); } + private final Function3 onPlayerMoved = new Function3() { + @Override public void call(PlayerMovementListener listener, PredefinedMap map, Coord newPosition, Coord previousPosition) { listener.onPlayerMoved(map, newPosition, previousPosition); } }; private final Function2 onPlayerEnteredNewMap = new Function2() { @@ -15,8 +15,8 @@ public final class PlayerMovementListeners extends ListOfListeners