From 1ffdb1015f64fcabf0243ee5b58e18d8731f9c95 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 4 Apr 2007 14:45:44 +0000
Subject: [PATCH] lol

---
 src/ei/game/gamestate/InGameState.java    |  5 ++++-
 src/ei/game/gamestate/LoadingState.java   |  1 -
 src/ei/game/player/Human.java             | 24 ++++++++++++++++++++++-
 src/ei/game/scene/buildings/Building.java |  3 ++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/ei/game/gamestate/InGameState.java b/src/ei/game/gamestate/InGameState.java
index 6081f79..29fd924 100644
--- a/src/ei/game/gamestate/InGameState.java
+++ b/src/ei/game/gamestate/InGameState.java
@@ -3,12 +3,14 @@ package ei.game.gamestate;
 import ei.engine.scene.Node;
 import ei.engine.state.GameState;
 import ei.game.input.InGameMouseInput;
+import ei.game.player.Human;
 import ei.game.scene.Map;
 
 
 public class InGameState extends GameState{
 	private Node rootNode;
 	private Map map;
+	private Human player;
 	
 	public InGameState(String name){
 		super(name);
@@ -19,7 +21,8 @@ public class InGameState extends GameState{
 		map = new Map(20,20);
 		rootNode.add(map.getMapNode());
 		
-		
+		player = new Human();
+		rootNode.add(player.getNode());
 	}
 	
 	public void render() {
diff --git a/src/ei/game/gamestate/LoadingState.java b/src/ei/game/gamestate/LoadingState.java
index 222cc4b..756ccf5 100644
--- a/src/ei/game/gamestate/LoadingState.java
+++ b/src/ei/game/gamestate/LoadingState.java
@@ -102,7 +102,6 @@ public class LoadingState extends GameState{
 	public void render() {
 		// Calculate the procentage
 		float procent = (float)status/100;//(loadTextures.size()+loadSounds.size());
-		System.out.println("lol: "+procent);
 		loadBar.setLocation(new Vector3f(
 				(LWJGLGameWindow.getWidth()/2)-loadBar.getWidth()+(loadBar.getWidth()*procent),
 				(LWJGLGameWindow.getHeight()/2)+6,0.0f));
diff --git a/src/ei/game/player/Human.java b/src/ei/game/player/Human.java
index ae9040b..3f2c4df 100644
--- a/src/ei/game/player/Human.java
+++ b/src/ei/game/player/Human.java
@@ -1,5 +1,27 @@
 package ei.game.player;
 
-public class Human {
+import java.util.ArrayList;
 
+import ei.engine.scene.Node;
+import ei.game.scene.GameEntity;
+import ei.game.scene.units.Unit;
+
+public class Human {
+	private ArrayList<GameEntity> units;
+	private Node unitsNode;
+	
+	public Human(){
+		units = new ArrayList<GameEntity>();
+		unitsNode = new Node("UnitsNode");
+	}
+	
+	
+	public void addUnit(Unit u){
+		units.add(u);
+		unitsNode.add(u.getSprite());
+	}
+	
+	public Node getNode(){
+		return unitsNode;
+	}
 }
diff --git a/src/ei/game/scene/buildings/Building.java b/src/ei/game/scene/buildings/Building.java
index 9ebadf4..1feadaa 100644
--- a/src/ei/game/scene/buildings/Building.java
+++ b/src/ei/game/scene/buildings/Building.java
@@ -1,13 +1,14 @@
 package ei.game.scene.buildings;
 
 import java.util.ArrayList;
+import java.util.Queue;
 
 import ei.game.scene.GameEntity;
 import ei.game.scene.units.Unit;
 
 public abstract class Building extends GameEntity{
 	private ArrayList<Unit> availableUnits;
-	private ArrayList<Unit> buildQueue;
+	private Queue<Unit> buildQueue;
 	
 	public Building(int l) {
 		super(l);