Bugfix: make sure that new rounds start at 6s after a combat has ended, and not somet...

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
index 0666385721e737f75676b827d2e944f4576ddfa9..3c27329d824cf4528a7641f051c7cdc80abbd83f 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
@@ -3,6 +3,7 @@ package com.gpl.rpg.AndorsTrail.controller;
 import com.gpl.rpg.AndorsTrail.context.ViewContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 import com.gpl.rpg.AndorsTrail.view.MainView;
 
@@ -31,13 +32,13 @@ public final class GameRoundController implements TimedMessageTask.Callback {
        --ticksUntilNextRound;
        if (ticksUntilNextRound <= 0) {
                onNewRound();
-               ticksUntilNextRound = Constants.TICKS_PER_ROUND;
+               restartWaitForNextRound();
        }
        
        --ticksUntilNextFullRound;
        if (ticksUntilNextFullRound <= 0) {
                onNewFullRound();
-               ticksUntilNextFullRound = Constants.TICKS_PER_FULLROUND;
+               restartWaitForNextFullRound();
        }
        
        return true;
@@ -46,21 +47,32 @@ public final class GameRoundController implements TimedMessageTask.Callback {
     public void resume() {
        view.mainActivity.updateStatus();
                model.uiSelections.isMainActivityVisible = true;
+               restartWaitForNextRound();
+               restartWaitForNextFullRound();
                roundTimer.start();
     }
-    public void pause() {
+    
+    private void restartWaitForNextFullRound() {
+       ticksUntilNextFullRound = Constants.TICKS_PER_FULLROUND;
+       }
+
+       private void restartWaitForNextRound() {
+       ticksUntilNextRound = Constants.TICKS_PER_ROUND;
+       }
+
+       public void pause() {
        roundTimer.stop();
        model.uiSelections.isMainActivityVisible = false;
     }
        
     public void onNewFullRound() {
-       Controller.resetMapsNotRecentlyVisited(world);
+               Controller.resetMapsNotRecentlyVisited(world);
                view.actorStatsController.applyConditionsToMonsters(model.currentMap, true);
        view.actorStatsController.applyConditionsToPlayer(model.player, true);
     }
     
     public void onNewRound() {
-       onNewMonsterRound();
+               onNewMonsterRound();
        onNewPlayerRound();
     }
     public void onNewPlayerRound() {