Merge branch 'fix' of https://github.com/ProjectGroepA2/Arcade into develop

Conflicts: control/GameStateManager.java model/objects/InfoPanel.java
2015-06-19 11:36:19 +02:00
parent a54c3e2991 d1a4ccf150
commit f72d54202f
6 changed files with 158 additions and 49 deletions
@@ -40,9 +40,13 @@ public class GameStateManager {
 		gamestates.add(new GameOverState(this, sh, sql));
 		setState(State.TITLE_STATE);
 	}
-	
-	public void setState(State st)	{
+
+	public void setState(State st)
+	{
+		if (st.ordinal() > 0)
+			currentState.stopAudio();
 		currentState = gamestates.get(st.ordinal());
+
 		init();
 	}