Merge remote-tracking branch 'remotes/origin/master' into story77

# Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml
2017-09-13 14:22:46 +12:00
parent 70ccb4cf1c
commit 079d93fc0f
3 changed files with 4 additions and 14 deletions
@@ -70,8 +70,8 @@ public class HostGameController extends Controller {
     */
    public void connectSocket(String address, int port) throws IOException {
        Socket socket = new Socket(address, port);
-        RaceStartController rsc = (RaceStartController)loadScene("raceStart.fxml");
-        rsc.enterLobby(socket, true);
+        InGameLobbyController iglc = (InGameLobbyController)loadScene("gameLobby.fxml");
+        iglc.enterGameLobby(socket, true);
    }

    /**