From 460226fc520adc76c353c2ace81cc65697f83a65 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 7 May 2007 16:58:06 +0000
Subject: [PATCH] Fixed some buggs

---
 src/data/map/default.obj                  |  2 +-
 src/ei/game/EI.java                       |  2 +-
 src/ei/game/gamestate/LoadingState.java   |  9 +++--
 src/ei/game/scene/buildings/Building.java | 44 ++++++++++++-----------
 src/ei/game/scene/map/Prison.java         |  4 +--
 5 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/data/map/default.obj b/src/data/map/default.obj
index 05e3475..5ecfeae 100644
--- a/src/data/map/default.obj
+++ b/src/data/map/default.obj
@@ -23,7 +23,7 @@
 0000000000000000000000000000000000000000
 0000000000000000000000000000000000000000
 0000000000000000000000000000000000000000
-0000000000000000000000000000000000000000
+0000000000003000000000000000000000000000
 0000000000000000000000000000000000000000
 0000000000000000000000000000000000000000
 0000000000000000000000000000000000000000
diff --git a/src/ei/game/EI.java b/src/ei/game/EI.java
index f575a36..aeab89e 100644
--- a/src/ei/game/EI.java
+++ b/src/ei/game/EI.java
@@ -9,7 +9,7 @@ import ei.game.gamestate.MenuState;
 import ei.game.gamestate.SplashState;
 
 public class EI extends LWJGLGameWindow{
-	public static final boolean debug = true;
+	public static final boolean debug = false;
 	
 	public static void main(String[] args){
 		new EI();
diff --git a/src/ei/game/gamestate/LoadingState.java b/src/ei/game/gamestate/LoadingState.java
index a47c615..3ff5bef 100644
--- a/src/ei/game/gamestate/LoadingState.java
+++ b/src/ei/game/gamestate/LoadingState.java
@@ -29,9 +29,12 @@ public class LoadingState extends GameState{
 		"data/buildings/prison/prison.png",
 		"data/hud/buildmenu.png",
 		"data/hud/money.png",
-		"data/map/Grass.png",
-		"data/map/redmud.jpg",
-		"data/map/sand.jpg",
+		"data/map/asfalt_horizontal.png",
+		"data/map/asfalt_vertical.png",
+		"data/map/asfalt.png",
+		"data/map/grass.png",
+		"data/map/redmud.png",
+		"data/map/sand.png",
 		"data/map/parking/parking_01.png",
 		"data/map/parking/parking_04.png",
 		"data/map/parking/parking_07.png",
diff --git a/src/ei/game/scene/buildings/Building.java b/src/ei/game/scene/buildings/Building.java
index 0b51a3d..313f039 100644
--- a/src/ei/game/scene/buildings/Building.java
+++ b/src/ei/game/scene/buildings/Building.java
@@ -44,37 +44,41 @@ public abstract class Building extends GameEntity{
 	}
 	
 	public void setSelected(Player p,boolean b, boolean playSound) {
-		if(b) {
-			SelectBox box = getSelection();
-			if(getPlayer() != p){
-				box.setColor(SelectBox.COLOR_RED);
-				unitNode.add(box.getSelectNode());
+		if(getSelection() != null){
+			if(b) {
+				SelectBox box = getSelection();
+				if(getPlayer() != p){
+					box.setColor(SelectBox.COLOR_RED);
+					unitNode.add(box.getSelectNode());
+				}
+				else{
+					box.setColor(SelectBox.COLOR_GREEN);
+					unitNode.add(box.getSelectNode());	
+				}
 			}
 			else{
-				box.setColor(SelectBox.COLOR_GREEN);
-				unitNode.add(box.getSelectNode());	
+				unitNode.remove(getSelection().getSelectNode());
 			}
 		}
-		else{
-			unitNode.remove(getSelection().getSelectNode());
-		}
 	}
 	
 	public void setMouseOver(Player p,boolean b) {
-		if(b) {
-			SelectBox box = getSelection();
-			if(getPlayer() != p){
-				box.setColor(SelectBox.COLOR_RED);
-				unitNode.add(box.getMouseOverNode());
+		if(getSelection() != null){
+			if(b) {
+				SelectBox box = getSelection();
+				if(getPlayer() != p){
+					box.setColor(SelectBox.COLOR_RED);
+					unitNode.add(box.getMouseOverNode());
+				}
+				else{
+					box.setColor(SelectBox.COLOR_GREEN);
+					unitNode.add(box.getMouseOverNode());	
+				}
 			}
 			else{
-				box.setColor(SelectBox.COLOR_GREEN);
-				unitNode.add(box.getMouseOverNode());	
+				unitNode.remove(getSelection().getMouseOverNode());
 			}
 		}
-		else{
-			unitNode.remove(getSelection().getMouseOverNode());
-		}
 	}
 	/**
 	 * Sets the size of the building.
diff --git a/src/ei/game/scene/map/Prison.java b/src/ei/game/scene/map/Prison.java
index 420b743..ae07a20 100644
--- a/src/ei/game/scene/map/Prison.java
+++ b/src/ei/game/scene/map/Prison.java
@@ -12,14 +12,14 @@ import ei.game.scene.weapons.WeaponHandler;
 
 public class Prison extends Building{
 	private static final String[] img = {
-		"data/map/prison/prison.png"
+		"data/buildings/prison/prison.png"
 	};
 	private SelectBox selectionBox;
 	private Sprite prison;
 
 	public Prison(Vector2i pos, Player p) {
 		super(2000, pos, p, 6);
-		prison = new Sprite("Factory",img[(int)(Math.random()*img.length)]);
+		prison = new Sprite("Prison",img[(int)(Math.random()*img.length)]);
 		prison.setSize(new Vector2f(300,300));
 		getNode().add(prison);