From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Tue, 24 Jul 2012 11:48:33 +0000 (+0200)
Subject: Merge branch 'production'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3a91b49cda4c15c835a0e4e8e06febe266712c37;p=users%2Fmchehab%2Fandors-trail.git

Merge branch 'production'

Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
---

3a91b49cda4c15c835a0e4e8e06febe266712c37
diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index 8341c65,26567d5..8a36325
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@@ -264,10 -265,12 +265,12 @@@ public final class CombatController imp
  	}
  	private void playerActionCompleted() {
  		context.mainActivity.updateStatus();
 -		if (!playerHasApLeft()) endPlayerTurn();
 +		if (!playerHasApLeft()) beginMonsterTurn(false);
  	}
  	private void continueTurn() {
-     	if (!playerHasApLeft()) handleNextMonsterAction();
+ 		if (model.uiSelections.isPlayersCombatTurn) return;
+ 		if (playerHasApLeft()) return;
+ 		handleNextMonsterAction();
  	}
  
  	private void executeCombatMove(final Coord dest) {
@@@ -302,8 -305,9 +305,9 @@@
          }
  	};
  	
 -	public void endPlayerTurn() {
 +	public void beginMonsterTurn(boolean isFirstRound) {
  		model.player.ap.current = 0;
+ 		model.uiSelections.isPlayersCombatTurn = false;
  		for (MonsterSpawnArea a : model.currentMap.spawnAreas) {
  			for (Monster m : a.monsters) {
  				m.setMaxAP();
@@@ -397,12 -409,12 +402,13 @@@
  	}
  	private void endMonsterTurn() {
  		currentActiveMonster = null;
 -		newPlayerTurn();
 +		newPlayerTurn(false);
  	}
  	
 -	private void newPlayerTurn() {
 +	private void newPlayerTurn(boolean isFirstRound) {
  		model.player.setMaxAP();
 +		if (!isFirstRound) context.gameRoundController.onNewPlayerRound();
+ 		model.uiSelections.isPlayersCombatTurn = true;
      	updateTurnInfo();
  	}
  	private void updateTurnInfo() {