From 9fbde9c25ee0707379ef7bd7a1b8d4a2e9531437 Mon Sep 17 00:00:00 2001
From: Jakob Stendahl <jakob.stendahl@outlook.com>
Date: Fri, 29 Sep 2017 17:27:14 +0200
Subject: Small workaround for where the enemy catches player

---
 td/Assets/Scenes/Level 1.unity     | Bin 47656 -> 47976 bytes
 td/Assets/Scripts/Enemy.cs         |  15 ++++++---------
 td/Assets/Scripts/EnemySpawner.cs  |   3 +--
 td/Assets/Scripts/cameraHandler.cs |   4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'td/Assets')

diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity
index d48cc6e..aeb84e1 100644
Binary files a/td/Assets/Scenes/Level 1.unity and b/td/Assets/Scenes/Level 1.unity differ
diff --git a/td/Assets/Scripts/Enemy.cs b/td/Assets/Scripts/Enemy.cs
index edd9e29..bd64bd5 100644
--- a/td/Assets/Scripts/Enemy.cs
+++ b/td/Assets/Scripts/Enemy.cs
@@ -12,21 +12,18 @@ public class Enemy : MonoBehaviour {
 	int waypointNum = -1;  // Using minus one so that first addition returns 0, first element in array
 
 	void Update () {
-		updateWaypoint ();
+		if ( (transform.position == waypointPos && waypointNum + 1 < waypoints.Count) || waypointNum == -1) {
+			waypointNum++;
+			waypointPos = new Vector3 (waypoints [waypointNum].x, 0.483f, waypoints [waypointNum].z);
+		}
 
 		float transformStep = speed * Time.deltaTime;
 		transform.position = Vector3.MoveTowards (transform.position, waypointPos, transformStep);
 
-		if (waypointNum == waypoints.Count - 1) {
+		// Selfdestruct if object reached the end
+		if (waypointNum + 1 >= waypoints.Count) {
 			Destroy (gameObject);
 		}
 	}
-
-	void updateWaypoint() {
-		if ( (transform.position == waypointPos && waypointNum < waypoints.Count - 1) || waypointNum == -1) {
-			waypointNum++;
-			waypointPos = new Vector3 (waypoints [waypointNum].x, 0.483f, waypoints [waypointNum].z);
-		}
-	}
 		
 }
diff --git a/td/Assets/Scripts/EnemySpawner.cs b/td/Assets/Scripts/EnemySpawner.cs
index f1eeb84..df82b34 100644
--- a/td/Assets/Scripts/EnemySpawner.cs
+++ b/td/Assets/Scripts/EnemySpawner.cs
@@ -7,9 +7,8 @@ public class EnemySpawner : MonoBehaviour {
 	public Enemy enemyPrefab;
 	public Transform pathWay;
 	public Transform gameWorld;
-	List<Vector3> waypoints = new List<Vector3>();
 
-	int wave;
+	List<Vector3> waypoints = new List<Vector3>();
 	int next = 1;
 	int n = 0;
 
diff --git a/td/Assets/Scripts/cameraHandler.cs b/td/Assets/Scripts/cameraHandler.cs
index a4aa660..0504a23 100644
--- a/td/Assets/Scripts/cameraHandler.cs
+++ b/td/Assets/Scripts/cameraHandler.cs
@@ -36,9 +36,9 @@ public class cameraHandler : MonoBehaviour {
 		if (Input.touchSupported && Application.platform != RuntimePlatform.WebGLPlayer) {
 			HandleTouch();
 		} else {
-			//HandleMouse();
+			HandleMouse();
 		}
-		HandleTouch ();
+		//HandleTouch ();
 	}
 
 	void HandleTouch() {
-- 
cgit v1.2.3