Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323]

main
Fan-Wu Yang 8 years ago
parent d6884a6981
commit 1ca276ec62

@ -111,7 +111,8 @@ public class Event {
this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1); this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1);
} else { } else {
this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle, false); this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8));
this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, windAngle);
this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML, this.raceXML = RaceXMLCreator.scaleRaceSize(raceXML,
windSpeed, raceLength); windSpeed, raceLength);
} }

@ -62,7 +62,7 @@ public class HostGameController extends Controller {
}); });
// set values and marks to be displayed // set values and marks to be displayed
sliderLength.setMin(1); sliderLength.setMin(2);
sliderLength.setMax(MAX_RACE_LENGTH); sliderLength.setMax(MAX_RACE_LENGTH);
sliderLength.setShowTickLabels(true); sliderLength.setShowTickLabels(true);
sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1); sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);

Loading…
Cancel
Save