Merge branch 'master' of https://github.com/bedder/Telethreat

Conflicts: Assets/Prefab/Weapons/LightAlient_Bullet.prefab
bedder · Nov 28, 2014 · 23db118 · 23db118
2 parents 92c7a7e + 8815f7e
commit 23db118
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Assets/Scripts/LevelGenerator.cs b/Assets/Scripts/LevelGenerator.cs
@@ -77,7 +77,6 @@ void Awake ()
 	{
         gameController = GameObject.FindObjectOfType<GameController>();
         prefab_player = (GameObject)gameController.playerController;
-        gameController.nextLevel = (gameController.nextLevel + 1) % Application.levelCount; // Make sure we load the next level upon completion
 
 		//Initialize objects
 		Vector2[] startGoalCells;

diff --git a/Assets/Scripts/PlayerGUI.cs b/Assets/Scripts/PlayerGUI.cs
@@ -73,6 +73,7 @@ void Start() {
         gameController = GameObject.FindObjectOfType<GameController>();
         gun = player.gun;
 
+        gameController.nextLevel++;
         displayLevelNumberUntil = Time.time + displayLevelNumberFor;
 
         barStyle = new GUIStyle();
@@ -200,10 +201,11 @@ void updateValues() {
             healthbarActual.width = 0;
             drawText(new Rect(0, 0, Screen.width, Screen.height), "You died.\nPress R to restart\nor Escape to exit", deathMessageStyle, 4);
             if (Input.GetButton("Restart")) {
-                gameController.nextLevel--;
+                gameController.nextLevel = Application.loadedLevel;
                 Application.LoadLevel(gameController.nextLevel);
             }
             if (Input.GetButton("Exit")) {
+                gameController.nextLevel = 1;
                 Application.LoadLevel(0);
             }
         }