From ef64874f365d50ca2e8b8a6b43b7e4f3742ad4be Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 4 Apr 2007 18:28:59 +0000
Subject: [PATCH] Added ability to move units

---
 src/ei/engine/test/TextTest.java        |  1 -
 src/ei/game/input/InGameMouseInput.java |  8 ++++----
 src/ei/game/scene/Map.java              | 23 +++++++++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/ei/engine/test/TextTest.java b/src/ei/engine/test/TextTest.java
index 2a814be..1e75a0e 100644
--- a/src/ei/engine/test/TextTest.java
+++ b/src/ei/engine/test/TextTest.java
@@ -2,7 +2,6 @@ package ei.engine.test;
 
 import ei.engine.LWJGLGameWindow;
 import ei.engine.effects.BitmapText;
-import ei.engine.effects.Text;
 import ei.engine.math.Vector2f;
 
 public class TextTest extends LWJGLGameWindow{
diff --git a/src/ei/game/input/InGameMouseInput.java b/src/ei/game/input/InGameMouseInput.java
index c296b89..f8ff487 100644
--- a/src/ei/game/input/InGameMouseInput.java
+++ b/src/ei/game/input/InGameMouseInput.java
@@ -6,9 +6,9 @@ import ei.engine.LWJGLGameWindow;
 import ei.engine.input.MouseInput;
 import ei.engine.math.Vector2i;
 import ei.engine.scene.Sprite;
+import ei.engine.util.MultiPrintStream;
 import ei.game.scene.GameEntity;
 import ei.game.scene.Map;
-import ei.game.scene.units.Unit;
 
 public class InGameMouseInput extends MouseInput{
 	private static final int CAMERA_MOVE_BORDER = 40;
@@ -49,7 +49,6 @@ public class InGameMouseInput extends MouseInput{
 		if(y > LWJGLGameWindow.getHeight()-CAMERA_MOVE_BORDER){
 			LWJGLGameWindow.getCamera().getLocation().add(0,-CAMERA_MOVE_SPEED,0);
 		}
-		//System.out.println(x+"-"+y);
 	}
 	
 	@Override
@@ -59,14 +58,15 @@ public class InGameMouseInput extends MouseInput{
 				LWJGLGameWindow.getCamera().getLocation().getX()+x,
 				LWJGLGameWindow.getCamera().getLocation().getY()+(LWJGLGameWindow.getHeight()-y));
 		if(!map.isPosEmpty(pos.getX(), pos.getY())){
+			//map.printAllUnits();
 			selected.clear();
-			System.out.println(pos.getX()+", "+pos.getY());
+			MultiPrintStream.out.println("Selecting: "+pos.getX()+", "+pos.getY());
 			selected.add(map.getPos(pos.getX(), pos.getY()));
 		}
 		else{
+			MultiPrintStream.out.println("Moving: "+pos.getX()+", "+pos.getY());
 			for(int i=0; i<selected.size() ;i++){
 				selected.get(i).move(pos.getX(),pos.getY());
-				System.out.println("Lolz");
 			}
 		}
 	}
diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java
index d769dfb..3d47071 100644
--- a/src/ei/game/scene/Map.java
+++ b/src/ei/game/scene/Map.java
@@ -69,16 +69,9 @@ public class Map {
 	 * @return True if empty else false
 	 */
 	public boolean isPosEmpty(int x, int y){
-		if(map[x][y] != null){
+		if(map[x][y] == null){
 			return true;
 		}
-		for(int i=0; i<width ;i++){
-			for(int j=0; j<hight ;j++){
-				if(map[i][j] != null){
-					System.out.println("LOL: "+i+" "+j);
-				}
-			}
-		}
 		return false;
 	}
 	
@@ -122,4 +115,18 @@ public class Map {
 	public Node getMapNode(){
 		return mapNode;
 	}
+	
+	/**
+	 * Prints all the units on the map
+	 *
+	 */
+	public void printAllUnits(){
+		for(int i=0; i<width ;i++){
+			for(int j=0; j<hight ;j++){
+				if(map[i][j] != null){
+					System.out.println("LOL: "+i+" "+j);
+				}
+			}
+		}
+	}
 }