Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory

# Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java
2017-08-03 00:28:44 +12:00
parent ad61dc6bce 0466292bd0
commit b581b01a44
4 changed files with 189 additions and 241 deletions
@@ -134,20 +134,9 @@ public class MockBoat extends Boat {
    /**
     * Moves the boat meters forward in the direction that it is facing
     * @param meters The number of meters to move forward.
-     * @param milliseconds The number of milliseconds to advance the boat's timers by.
+     *
     */
-    public void moveForwards(double meters, long milliseconds) {
-
-
-        //Update the boat's time since last tack.
-        this.setTimeSinceTackChange(this.getTimeSinceTackChange() + milliseconds);
-
-        //Update the time into the current leg.
-        this.setTimeElapsedInCurrentLeg(this.getTimeElapsedInCurrentLeg() + milliseconds);
-
-        //Update the distance into the current leg.
-        this.setDistanceTravelledInLeg(this.getDistanceTravelledInLeg() + meters);
-
+    public void moveForwards(double meters) {
        //Updates the current position of the boat.
        GPSCoordinate newPosition = GPSCoordinate.calculateNewPosition(this.getCurrentPosition(), meters, Azimuth.fromBearing(this.getBearing()));
        this.setCurrentPosition(newPosition);