Fixed faulty develop merge and completed manual testing before merging back into develop.

tags: #story[1111]
This commit is contained in:
Alistair McIntyre
2017-08-14 14:15:34 +12:00
parent c52c345e53
commit 8b543488e3
2 changed files with 7 additions and 8 deletions
@@ -312,7 +312,9 @@ public class GameClient {
switch (e.getCode()) {
//TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet)
case SHIFT: // sails in/sails out
socketThread.sendBoatAction(BoatAction.SAILS_IN); break;
socketThread.sendBoatAction(BoatAction.SAILS_IN);
raceView.getGameView().getPlayerYacht().toggleClientSail();
break;
case PAGE_UP:
case PAGE_DOWN:
socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break;