From 9c78b6a2ec03e1d57c6d9a63bc9ed9ef2bb3ef89 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Thu, 8 Aug 2013 00:34:18 +0200
Subject: [PATCH] Refactor player combat round methods

---
 .../gpl/rpg/AndorsTrail/controller/CombatController.java | 9 ++++++---
 .../src/com/gpl/rpg/AndorsTrail/view/CombatView.java     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index df2369bcd..1aea5b9f0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -240,7 +240,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 			exitCombat(true);
 			return;
 		}
-		if (!playerHasApLeft()) beginMonsterTurn(false);
+		if (!playerHasApLeft()) endPlayerTurn();
 	}
 	private void continueTurn() {
 		if (world.model.uiSelections.isPlayersCombatTurn) return;
@@ -270,7 +270,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 
 	private void fleeingFailed() {
 		combatActionListeners.onPlayerFailedFleeing();
-		beginMonsterTurn(false);
+		endPlayerTurn();
 	}
 
 	private final Handler monsterTurnHandler = new Handler() {
@@ -288,7 +288,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 	}
 
-	public void beginMonsterTurn(boolean isFirstRound) {
+	public void endPlayerTurn() {
+		beginMonsterTurn(false);
+	}
+	private void beginMonsterTurn(boolean isFirstRound) {
 		controllers.actorStatsController.setActorMinAP(world.model.player);
 		world.model.uiSelections.isPlayersCombatTurn = false;
 		for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
index a68b13f73..ca5f40799 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
@@ -72,7 +72,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 		endTurnButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				c.beginMonsterTurn(false);
+				c.endPlayerTurn();
 			}
 		});
 		Button fleeButton = (Button) findViewById(R.id.combatview_flee);