From 901206c1083d4c538d0650ca707db608913bf3b2 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Thu, 19 Apr 2007 12:41:38 +0000
Subject: [PATCH]

---
 src/ei/game/scene/Map.java        | 11 +++++++++++
 src/ei/game/scene/units/Unit.java | 31 ++++++++++++++++---------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java
index cff7f86..bf174c4 100644
--- a/src/ei/game/scene/Map.java
+++ b/src/ei/game/scene/Map.java
@@ -134,6 +134,17 @@ public class Map {
 		return mapNode;
 	}
 	
+	public Vector2i getPosIndex(GameEntity u){
+		for(int i=0; i<width ;i++){
+			for(int j=0; j<hight ;j++){
+				if(map[i][j] == u){
+					return new Vector2i(i,j);
+				}
+			}
+		}
+		return null;
+	}
+	
 	/**
 	 * Prints all the units on the map
 	 *
diff --git a/src/ei/game/scene/units/Unit.java b/src/ei/game/scene/units/Unit.java
index 95653bd..2718729 100644
--- a/src/ei/game/scene/units/Unit.java
+++ b/src/ei/game/scene/units/Unit.java
@@ -233,23 +233,24 @@ public abstract class Unit extends GameEntity{
 		}
 		else if(attack != null){
 			Weapon wepon = getWeapon(new Vector2f(unitNode.getLocation().getX(), unitNode.getLocation().getY()));
-			Vector2i enamyPos = Map.getPosByPixel(attack.getNode().getLocation().getX(), attack.getNode().getLocation().getY()+1);
-			
-			if(wepon.onRange(new Vector2f(attack.getNode().getLocation().getX(), attack.getNode().getLocation().getY()))){
-				if(weponTimer >= wepon.getReload()){
-					wepon.launch(enamyPos);
-					WeaponHandler.getInstance().addWeapon(wepon);
-					weponTimer = 0;
-				}
-				else{
-					weponTimer++;
-				}
+			Vector2i enamyPos = InGameState.getMap().getPosIndex(attack);
+			if(attack.getLife() <= 0 || enamyPos == null){
+				attack = null;
 			}
 			else{
-				move(enamyPos.getX(),enamyPos.getY(), false);
-			}
-			if(attack.getLife() <= 0){
-				attack = null;
+				if(wepon.onRange(new Vector2f(attack.getNode().getLocation().getX(), attack.getNode().getLocation().getY()))){
+					if(weponTimer >= wepon.getReload()){
+						wepon.launch(enamyPos);
+						WeaponHandler.getInstance().addWeapon(wepon);
+						weponTimer = 0;
+					}
+					else{
+						weponTimer++;
+					}
+				}
+				else{
+					move(enamyPos.getX(),enamyPos.getY(), false);
+				}
 			}
 		}
 	}