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: Continue combat after having seen the combat log

Browse Source 
* Previously, combat was stopped when entering the combat log. This commit makes the combat continue after having been stopped.
This commit is contained in:
Oskar Wiksten
2013-10-20 09:03:53 +02:00
parent 518934751b
commit a0f943994f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View File

@@ -168,10 +168,6 @@ public final class MainActivity
controllers.gameRoundController.resume();
if (world.model.uiSelections.isInCombat) {
controllers.combatController.setCombatSelection(world.model.uiSelections.selectedMonster, world.model.uiSelections.selectedPosition);
controllers.combatController.enterCombat(CombatController.BeginTurnAs.continueLastTurn);
}
updateStatus();
}

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

@@ -52,6 +52,11 @@ public final class GameRoundController implements TimedMessageTask.Callback {
public void resume() {
world.model.uiSelections.isMainActivityVisible = true;
roundTimer.start();
if (world.model.uiSelections.isInCombat) {
controllers.combatController.setCombatSelection(world.model.uiSelections.selectedMonster, world.model.uiSelections.selectedPosition);
controllers.combatController.enterCombat(CombatController.BeginTurnAs.continueLastTurn);
}
}
private void restartWaitForNextFullRound() {