From 9386b1bbbcfe7fb9151ecf05ea78080b75e521db Mon Sep 17 00:00:00 2001
From: Pan <Pan@192.168.1.12>
Date: Mon, 21 Jan 2019 22:27:32 +1300
Subject: [PATCH] home commit

---
 core/AssetManager.java       | 4 ++--
 enemyAI/combatManagerAI.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/AssetManager.java b/core/AssetManager.java
index f057008..ef73f32 100644
--- a/core/AssetManager.java
+++ b/core/AssetManager.java
@@ -251,8 +251,8 @@ public class AssetManager {
 		for(int i = 0; i < 10; i ++){
 			
 			for(int j = 0; j < 6; j++){
-				lightTank l = new lightTank(new vector(i*0.25f+ 1.125f,-0.3f, 17.375f - 0.25f*j), 90, 0);
-				addLightTank(l);
+				//lightTank l = new lightTank(new vector(i*0.25f+ 1.125f,-0.3f, 17.375f - 0.25f*j), 90, 0);
+				//addLightTank(l);
 				//l.hasMultiShotUpgrade = true;
 				//lightTank l = new lightTank(new vector(i*0.25f + 1.125f,-0.3f, 0.5f + 18.625f + j*0.25f), 90, 0);
 				
diff --git a/enemyAI/combatManagerAI.java b/enemyAI/combatManagerAI.java
index 93c6551..2f75dad 100644
--- a/enemyAI/combatManagerAI.java
+++ b/enemyAI/combatManagerAI.java
@@ -214,7 +214,7 @@ public class combatManagerAI {
 				}
 				
 				//check if defenceManager found a major threat
-				if(mainThread.ec.theDefenseManagerAI.majorThreatLocation.screenX != 0) {
+				if(mainThread.ec.theDefenseManagerAI.majorThreatLocation.x != 0) {
 					currentState = aggressing;
 					attackDirection.set(mainThread.ec.theDefenseManagerAI.majorThreatLocation.x - combatCenterX, 0, mainThread.ec.theDefenseManagerAI.majorThreatLocation.z - combatCenterZ);
 					attackDirection.unit();