Cleanup and added method for reseteting an object so that it's ready

to be used next time.

core/src/no/ntnu/trostespel/state/GameState.java

@@ -2,7 +2,6 @@
 
 import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
 
-import java.util.HashMap;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;

core/src/no/ntnu/trostespel/state/MovableState.java

@@ -5,6 +5,8 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 
+import static no.ntnu.trostespel.state.Action.KILL;
+
 public class MovableState extends ObjectState {
 
     private long id;
@@ -14,6 +16,7 @@ public class MovableState extends ObjectState {
 
     private transient int timeAlive;
     public final transient int damage = 15;
+    private static AtomicLong idCounter = new AtomicLong();
 
     public MovableState(long pid, double velocity) {
         super(24f, 24f, Vector2.Zero);
@@ -25,6 +28,16 @@ public MovableState(long pid, double velocity) {
         this.heading.setLength((float) velocity);
     }
 
+    public MovableState(double velocity) {
+        super(24f, 24f, Vector2.Zero);
+        this.heading = new Vector2(1, 0); // Unit vector
+        this.id = createID();
+        this.pid = 0;
+        this.action = Action.CREATE;
+        this.heading = new Vector2(1, 0);
+        this.heading.setLength((float) velocity);
+    }
+
     public void setPositionWithSpawnOffset(Vector2 position) {
         this.setPosition(position.add(GameRules.Projectile.SPAWN_OFFSET));
     }
@@ -73,7 +86,6 @@ public void setPid(long pid) {
         this.pid = pid;
     }
 
-    private static AtomicLong idCounter = new AtomicLong();
     public static long createID() {
         return idCounter.getAndIncrement();
     }
@@ -93,4 +105,15 @@ public int getTimeAlive() {
     public void incrementTimeAlive() {
         this.timeAlive++;
     }
+
+    /**
+     * This method is intented for reseting the object and make it ready for reuse.
+     */
+    public void resetObject() {
+        id = 0;
+        pid = 0;
+        action = KILL;
+        heading = Vector2.Zero;
+        timeAlive = 0;
+    }
 }