From 667ce1cb0af2b16c7ffa55f9b10838d3bb1377ea Mon Sep 17 00:00:00 2001
From: Phillip <pacardon@u.washington.edu>
Date: Mon, 14 Mar 2011 17:22:08 +0000
Subject: Removed World Reference as it CANNOT be serialized (oops!)

---
 src/tesseract/objects/remote/RemoteObject.java     |  2 +-
 src/tesseract/objects/remote/RemoteObjectMenu.java |  2 +-
 src/tesseract/objects/remote/TankMenuItem.java     | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/tesseract/objects/remote')

diff --git a/src/tesseract/objects/remote/RemoteObject.java b/src/tesseract/objects/remote/RemoteObject.java
index 789a545..e3edc1c 100644
--- a/src/tesseract/objects/remote/RemoteObject.java
+++ b/src/tesseract/objects/remote/RemoteObject.java
@@ -68,6 +68,6 @@ public abstract class RemoteObject extends PhysicalObject {
 		keyEventReceived(keyEvent);
 		
 		updateTranformGroup();
-	}
+	} 
 
 }
diff --git a/src/tesseract/objects/remote/RemoteObjectMenu.java b/src/tesseract/objects/remote/RemoteObjectMenu.java
index 606e9bb..3d4435e 100644
--- a/src/tesseract/objects/remote/RemoteObjectMenu.java
+++ b/src/tesseract/objects/remote/RemoteObjectMenu.java
@@ -27,7 +27,7 @@ public class RemoteObjectMenu extends JMenu {
 		myControlledObjects = new ArrayList<RemoteObject>();
 		
 		// Objects that can be added
-		add(new TankMenuItem(this, theWorld));
+		add(new TankMenuItem(this));
 		
 		// Separator
 		addSeparator();
diff --git a/src/tesseract/objects/remote/TankMenuItem.java b/src/tesseract/objects/remote/TankMenuItem.java
index 3cebb33..4e18a9c 100644
--- a/src/tesseract/objects/remote/TankMenuItem.java
+++ b/src/tesseract/objects/remote/TankMenuItem.java
@@ -6,15 +6,15 @@ import tesseract.World;
 import tesseract.objects.tank.Tank;
 
 public class TankMenuItem extends RemoteObjectMenuItem {
-	private final World myWorld;
 	
-	public TankMenuItem(final RemoteObjectMenu theMenu, World theWorld) {
+	
+	public TankMenuItem(final RemoteObjectMenu theMenu) {
 		super("Tank", theMenu);
-		myWorld = theWorld;
+		
 	}
 
 	@Override
 	protected RemoteObject createRemoteObject() {
-		return new Tank(new Vector3f(), 1, myWorld);
-	}
+		return new Tank(new Vector3f(), 1);
+	} 
 }
-- 
cgit v1.2.3