fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boats now start the race with sails out. #story[1098]

Browse Source
This commit is contained in:
Joseph Gardner
2017-08-10 13:25:57 +12:00
parent 20302496f0
commit d8628b4289
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/model/MockRace.java
+1 -1
View File
@@ -319,7 +319,7 @@ public class MockRace extends Race {
//Checks if the current boat has finished the race or not. //Checks if the current boat has finished the race or not.
boolean finish = this.isLastLeg(boat.getCurrentLeg()); boolean finish = this.isLastLeg(boat.getCurrentLeg());
if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && !boat.isSailsOut()) { if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && boat.isSailsOut()) {
// if (boat.getCurrentSpeed() == 0) { // if (boat.getCurrentSpeed() == 0) {
// newOptimalVMG(boat); // newOptimalVMG(boat);
racevisionGame/src/main/java/shared/model/Boat.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class Boat {
/** /**
* The state of the boats sails. True if sails are out. * The state of the boats sails. True if sails are out.
*/ */
private boolean sailsOut = false; private boolean sailsOut = true;
/** /**
* Constructs a boat object with a given sourceID, name, country/team abbreviation, and polars table. * Constructs a boat object with a given sourceID, name, country/team abbreviation, and polars table.
racevisionGame/src/main/java/visualiser/model/ThisBoat.java
+1 -1
View File
@@ -6,7 +6,7 @@ package visualiser.model;
public class ThisBoat { public class ThisBoat {
// TODO Initialise sourceID to the sourceID given by the network // TODO Initialise sourceID to the sourceID given by the network
private int sourceID = 125; private int sourceID = 125;
private boolean sailsOut = false; private boolean sailsOut = true;
private static ThisBoat instance = new ThisBoat(); private static ThisBoat instance = new ThisBoat();
private ThisBoat(){} private ThisBoat(){}