summaryrefslogtreecommitdiff
path: root/src/tesseract/objects/tank/Tank.java
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/tank/Tank.java
parentfc967a54d875b57599c87e8f6fef520f13b5cb9a (diff)
Removed World Reference as it CANNOT be serialized (oops!)
Diffstat (limited to 'src/tesseract/objects/tank/Tank.java')
-rw-r--r--src/tesseract/objects/tank/Tank.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/tesseract/objects/tank/Tank.java b/src/tesseract/objects/tank/Tank.java
index d9975b3..059efa5 100644
--- a/src/tesseract/objects/tank/Tank.java
+++ b/src/tesseract/objects/tank/Tank.java
@@ -27,22 +27,21 @@ public class Tank extends RemoteObject {
private static final int maxBarrelElevation = 14;
private static final int minBarrelElevation = -1;
- public Tank(final Vector3f thePosition, final float mass,
- final World theWorld) {
- this(thePosition, mass, DEFAULT_SCALE, theWorld);
+ public Tank(final Vector3f thePosition, final float mass) {
+ this(thePosition, mass, DEFAULT_SCALE);
}
public Tank(final Vector3f thePosition, final float mass,
- final float theScale, final World theWorld) {
+ final float theScale) {
this(thePosition, mass, theScale, DEFAULT_BODY_COLOR,
- DEFAULT_TRACK_COLOR, DEFAULT_TURRET_COLOR, theWorld);
+ DEFAULT_TRACK_COLOR, DEFAULT_TURRET_COLOR);
}
public Tank(final Vector3f thePosition, final float mass,
final float theScale, final Color bodyColor, final Color trackColor,
- final Color turretColor, final World theWorld) {
+ final Color turretColor) {
super (thePosition, mass);
- tank = new Body(trackColor, bodyColor, theScale, turretColor, theWorld);
+ tank = new Body(trackColor, bodyColor, theScale, turretColor);
//orientation = new Vector3f();
aim = new Vector3f();
gunLocation = new Point3f();
@@ -148,7 +147,7 @@ public class Tank extends RemoteObject {
barrelElevation--;
}
break;
- }
+ }
}