Merged master.

2017-08-17 09:27:41 +12:00
parent f60809bdd4
commit 47fc55245c
5 changed files with 19 additions and 21 deletions
@@ -4,9 +4,7 @@ package visualiser.model;
 * The properties of the boat currently being controlled by the player. Singleton.
 */
 public class ThisBoat {
-    // TODO Initialise sourceID to the sourceID given by the network
-    private int sourceID = 125;
-    private boolean sailsOut = true;
+    private VisualiserBoat boat;
    private static ThisBoat instance = new ThisBoat();
    
    private ThisBoat(){}
@@ -16,18 +14,18 @@ public class ThisBoat {
    }

    public void setSailsOut(boolean sailsOut) {
-        this.sailsOut = sailsOut;
-    }
-
-    public void setSourceID(int sourceID) {
-        this.sourceID = sourceID;
+        this.boat.setSailsOut(sailsOut);
    }

    public boolean isSailsOut() {
-        return sailsOut;
+        return this.boat.isSailsOut();
    }

    public int getSourceID() {
-        return sourceID;
+        return this.boat.getSourceID();
+    }
+
+    public void setBoat(VisualiserBoat boat) {
+        this.boat = boat;
    }
 }