diff --git a/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java b/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java index b1276814..4b7d33c3 100644 --- a/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java +++ b/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java @@ -44,6 +44,7 @@ public class MarkRoundingMessage extends Message{ putInt((int) raceId, 4); putInt((int) sourceId, 4); putByte((byte) boatStatus.getCode()); + System.out.println(roundingSide.getCode()); putByte((byte) roundingSide.getCode()); putByte((byte) markType.getCode()); putByte((byte) markId); diff --git a/src/main/java/seng302/model/mark/CompoundMark.java b/src/main/java/seng302/model/mark/CompoundMark.java index b9385446..c45750af 100644 --- a/src/main/java/seng302/model/mark/CompoundMark.java +++ b/src/main/java/seng302/model/mark/CompoundMark.java @@ -72,7 +72,6 @@ public class CompoundMark { getSubMark(1).setRoundingSide(RoundingSide.STARBOARD); break; - } } diff --git a/src/main/java/seng302/visualiser/MapMaker.java b/src/main/java/seng302/visualiser/MapMaker.java index 073c9d60..5bda5b7e 100644 --- a/src/main/java/seng302/visualiser/MapMaker.java +++ b/src/main/java/seng302/visualiser/MapMaker.java @@ -1,6 +1,5 @@ package seng302.visualiser; -import java.io.File; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; @@ -35,7 +34,8 @@ public class MapMaker { private int index = 0; private XMLGenerator xmlGenerator = new XMLGenerator(); - private List maps = new ArrayList<>(Arrays.asList("default.xml", "horseshoe.xml", "loop.xml")); + private List maps = new ArrayList<>( + Arrays.asList("default.xml", "horseshoe.xml", "madagascar.xml", "loop.xml")); public static MapMaker getInstance() { if (instance == null) { diff --git a/src/main/resources/maps/madagascar.xml b/src/main/resources/maps/madagascar.xml index 2c82e661..37113567 100644 --- a/src/main/resources/maps/madagascar.xml +++ b/src/main/resources/maps/madagascar.xml @@ -3,62 +3,63 @@ Madagascar - 57.6679590 - 11.8503233 + -15.67707 + 49.79338 10 - - + + - + - - + - - + - - + + + + + + - - - + + + + + - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file