Fixed timer yeaaahboi

Stektpotet · Dec 3, 2016 · 04bcf6e · 04bcf6e
1 parent eb3b49f
commit 04bcf6e
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 1 deletion.
diff --git a/Assets/Game/Materials/Clouds.mat b/Assets/Game/Materials/Clouds.mat
diff --git a/Assets/Game/Materials/SkyLit.mat b/Assets/Game/Materials/SkyLit.mat
diff --git a/Assets/Game/Materials/Window.mat b/Assets/Game/Materials/Window.mat
diff --git a/Assets/Game/Scenes/level1.unity b/Assets/Game/Scenes/level1.unity
diff --git a/Assets/Game/Scenes/level2.unity b/Assets/Game/Scenes/level2.unity
diff --git a/Assets/Game/Scenes/level3.unity b/Assets/Game/Scenes/level3.unity
diff --git a/Assets/Game/Scripts/TimerManager.cs b/Assets/Game/Scripts/TimerManager.cs
@@ -44,7 +44,7 @@ public void Reset()
 	public string TimeFormat(float time)
 	{
 		int m = Mathf.RoundToInt(time) / 60;
-		int s = (Mathf.RoundToInt(time)-m*60) - m;
+		int s = Mathf.RoundToInt(time)-m*60;
 
 		return m + "m " + s + "s";
 	}

diff --git a/Assets/StartTimer.cs b/Assets/StartTimer.cs
@@ -7,6 +7,7 @@ public class StartTimer : MonoBehaviour
 	public void EnableTimer()
 	{
 		GameManager.timed = true;
+		TimerManager.time = 0;
 	}
 	public void DisableTimer()
 	{