summaryrefslogtreecommitdiff
path: root/src/tesseract/objects/remote
diff options
context:
space:
mode:
authorPhillip <pacardon@u.washington.edu>2011-03-14 17:22:08 +0000
committerPhillip <pacardon@u.washington.edu>2011-03-14 17:22:08 +0000
commit667ce1cb0af2b16c7ffa55f9b10838d3bb1377ea (patch)
treec724626622dcd7740462c4b21e280bcb99c1548d /src/tesseract/objects/remote
parentfc967a54d875b57599c87e8f6fef520f13b5cb9a (diff)
Removed World Reference as it CANNOT be serialized (oops!)
Diffstat (limited to 'src/tesseract/objects/remote')
-rw-r--r--src/tesseract/objects/remote/RemoteObject.java2
-rw-r--r--src/tesseract/objects/remote/RemoteObjectMenu.java2
-rw-r--r--src/tesseract/objects/remote/TankMenuItem.java10
3 files changed, 7 insertions, 7 deletions
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);
+ }
}