Game resets after Lose_music has finished playing

hackerspace-ntnu · Feb 21, 2018 · 8becf41 · 8becf41
1 parent 292758c
commit 8becf41
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 32 deletions.
diff --git a/Assets/Scripts/GameManager_level01.cs b/Assets/Scripts/GameManager_level01.cs
@@ -11,7 +11,8 @@ public class GameManager_level01 : MonoBehaviour, IGameManager
 	public GameHealthManager gameHealthManager;
 	public GameUI_ImportantMessage importantMessage;
 
-	private float timeToStart = 3f;
+	public string sceneLoadedOnRestart = "menu";
+
 	public bool started = false;
 	public bool levelEnded = false;
 
@@ -56,13 +57,6 @@ void Update()
 					GameStart();
 				if (Input.GetKeyUp(KeyCode.S))
 					GameLost();
-				if (timeToStart >= 0)
-				{
-					//timeToStart -= Time.deltaTime;
-				} else
-				{
-					//GameStart ();
-				}
 			}
 			if (started)
 			{
@@ -88,18 +82,6 @@ void Update()
 		}
 	}
 
-	public void GameLost()
-	{
-		levelEnded = true;
-		print("You have lost the game");
-		spawnManager.StopSpawning();
-		importantMessage.Show("Game Over");
-		SoundManager.PlayLevelLostSound();
-		//Invoke ("LoadMenu", 5f);
-		//change scene??
-		Invoke("GameRestart", 10f);
-	}
-
 	public void GameStart()
 	{
 		if (started)
@@ -120,22 +102,29 @@ public void GamePause()
 		throw new System.NotImplementedException();
 	}
 
-	public void GameRestart()
-	{
-		SceneManager.LoadScene("menu");
-	}
-
 	public void GameWin()
 	{
 		levelEnded = true;
 		print("You have won the game");
 		importantMessage.Show("Game Win");
-		SoundManager.PlayWinFanfare();
-		Invoke("GameRestart", 5f);
+
+		AudioClip sound = SoundManager.PlayWinFanfare();
+		Invoke("GameRestart", Mathf.Max(sound.length, 5f));
 	}
 
-	void LoadMenu()
+	public void GameLost()
+	{
+		levelEnded = true;
+		print("You have lost the game");
+		spawnManager.StopSpawning();
+		importantMessage.Show("Game Over");
+
+		AudioClip sound = SoundManager.PlayLevelLostSound();
+		Invoke("GameRestart", Mathf.Max(sound.length, 10f));
+	}
+
+	public void GameRestart()
 	{
-		SceneManager.LoadScene("menu");
+		SceneManager.LoadScene(sceneLoadedOnRestart);
 	}
 }
diff --git a/Assets/Scripts/ResetHotkeys.cs b/Assets/Scripts/ResetHotkeys.cs
@@ -5,7 +5,7 @@
 
 public class ResetHotkeys : MonoBehaviour
 {
-	public string sceneLoadedWhenReset;
+	public string sceneLoadedWhenReset = "menu";
 
 	private SteamVR_Controller.Device[] controllers = null;
 

diff --git a/Assets/Scripts/Sound/SoundManager.cs b/Assets/Scripts/Sound/SoundManager.cs
@@ -44,16 +44,18 @@ public static void PlayCrowSound(Vector3 point)
 		Destroy(audio.gameObject, THIS.crowSound.length);
 	}
 
-	public static void PlayLevelLostSound()
+	public static AudioClip PlayLevelLostSound()
 	{
 		THIS.levelMusicChild.GetComponent<AudioSource>().Stop();
 		THIS.audioSource.PlayOneShot(THIS.gameLost);
+		return THIS.gameLost;
 	}
 
-	public static void PlayWinFanfare()
+	public static AudioClip PlayWinFanfare()
 	{
 		THIS.levelMusicChild.GetComponent<AudioSource>().Stop();
 		THIS.audioSource.PlayOneShot(THIS.gameWon);
+		return THIS.gameLost;
 	}
 
 	public static void PlaySoundAtPoint(AudioClip sound, Vector3 point, float volume = 1f, Transform parent = null)