f

AndreiBarsan · Dec 18, 2011 · cac20ae · cac20ae
1 parent 199c6fc
commit cac20ae
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 24 deletions.
diff --git a/fanta-is-awesome/bin/com/siegedog/hava/engine/Node.class b/fanta-is-awesome/bin/com/siegedog/hava/engine/Node.class
diff --git a/fanta-is-awesome/bin/com/siegedog/hava/engine/PlatformerEntityNode$1.class b/fanta-is-awesome/bin/com/siegedog/hava/engine/PlatformerEntityNode$1.class
diff --git a/fanta-is-awesome/bin/com/siegedog/hava/engine/PlatformerEntityNode.class b/fanta-is-awesome/bin/com/siegedog/hava/engine/PlatformerEntityNode.class
diff --git a/fanta-is-awesome/data/img/sprites/bear.psd b/fanta-is-awesome/data/img/sprites/bear.psd
diff --git a/fanta-is-awesome/src/com/siegedog/hava/engine/Node.java b/fanta-is-awesome/src/com/siegedog/hava/engine/Node.java
@@ -97,30 +97,11 @@ public void update(float delta) {
 
 	public void dispose() // WOOOOOOOOOOOOOOOOOOOT
 	{
-		if(parent != null)
-		{
-			try
-			{
-				parent.wait();
-			}
-			catch (Exception e)
-			{
-				return;
-			}
-			parent.removeNode(this);
-		}
+
+		parent.removeNode(this);
 		if(this instanceof RenderNode2D)
-		{
-			try
-			{
-				renderNodes.wait();
-			}
-			catch (Exception e)
-			{
-				return;
-			}
-			renderNodes.remove(this);
-
+		{			
+			renderNodes.remove(this);	
 		}
 	}
 

diff --git a/fanta-is-awesome/src/com/siegedog/hava/engine/PlatformerEntityNode.java b/fanta-is-awesome/src/com/siegedog/hava/engine/PlatformerEntityNode.java
@@ -56,7 +56,6 @@ public PlatformerEntityNode(float x, float y, float w, float h) {
 
 		//AIInputNode tmpINode = new AIInputNode();
 		//tmpINode.setAI(new LulzyAINode());
-
 		//addNode(inputNode = tmpINode);
 		setPosition(x, y);
 		track = body.getPosition();