Fixed computer redoing his round every time reopen app

jonkjenn · Apr 25, 2014 · 2afd76e · 2afd76e
1 parent 2a8a75d
commit 2afd76e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/Ambiguous/src/no/hiof/android/ambiguous/GameMachine.java b/Ambiguous/src/no/hiof/android/ambiguous/GameMachine.java
@@ -185,11 +185,10 @@ private void checkDead() {
 			state = State.GAME_OVER;
 		}
 	}
-
-	public void setStateAndNotify(State state)
-	{
+
+	public void setStateAndNotify(State state) {
 		this.state = state;
-		notifyStateChange();		
+		notifyStateChange();
 	}
 
 	/**
@@ -357,7 +356,9 @@ public void clearGameMachineListener() {
 	}
 
 	public void setTurnChangeListener(TurnChangeListener listener) {
-		turnChangeListeners.add(listener);
+		if (!turnChangeListeners.contains(listener)) {
+			turnChangeListeners.add(listener);
+		}
 	}
 
 	public void removeTurnChangeListener(TurnChangeListener listener) {

diff --git a/Ambiguous/src/no/hiof/android/ambiguous/fragments/SinglePlayerFragment.java b/Ambiguous/src/no/hiof/android/ambiguous/fragments/SinglePlayerFragment.java
@@ -26,26 +26,30 @@ public class SinglePlayerFragment extends Fragment {
 	@Override
 	public void onStart() {
 		super.onStart();
-		if (getArguments() != null) {
-			resumeGame(getArguments());
-		}
 		sds = new SessionDataSource((Db.getDb(getActivity()
 				.getApplicationContext()).getWritableDatabase()));
-
 		setupController();
 
-		startGameMachine();
 	}
 
-	void startGameMachine() {
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (getArguments() != null) {
+			resumeGame(getArguments());
+		}
+		GameActivity.gameMachine.setTurnChangeListener(aiController);
+
 		GameActivity.gameMachine.startGame(GameActivity.gameMachine.state);
 	}
 
+
 	void setupController() {
-		aiController = new AIController(GameActivity.gameMachine.opponent,
-				GameActivity.gameMachine.player,
-				GameActivity.opponentController);
-		GameActivity.gameMachine.setTurnChangeListener(aiController);
+		if (aiController == null) {
+			aiController = new AIController(GameActivity.gameMachine.opponent,
+					GameActivity.gameMachine.player,
+					GameActivity.opponentController);
+		}
 	}
 
 	private void resumeGame(Bundle extras) {