From 1cbb24e9fd4d2d0c5d34f0d49bb9df5235dd9c0b Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Wed, 13 Sep 2017 15:05:36 +1200 Subject: [PATCH] Merged in master #story[1185] --- racevisionGame/src/main/java/mock/app/Event.java | 3 ++- racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java index 49ee8fab..70bcf177 100644 --- a/racevisionGame/src/main/java/mock/app/Event.java +++ b/racevisionGame/src/main/java/mock/app/Event.java @@ -110,7 +110,8 @@ public class Event { //this.raceXML = RaceXMLCreator.alterRaceToWind(raceXMLFile, 90); this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8)); if(mapIndex==4){ - this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8), 1000, 5000); + //this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8), 1000, 5000); + this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1, true); } else { this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, 300, false); } diff --git a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java index 3e769571..92f68518 100644 --- a/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java +++ b/racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java @@ -92,7 +92,9 @@ public class RaceXMLCreator { double degreesToRotate = degrees - raceOriginalBearing; - alterRaceRotation(race, degreesToRotate); + if (degrees >= 0) { + alterRaceRotation(race, degreesToRotate); + } return XMLUtilities.classToXML(race);