From 086206a6237052e325182479d596745873be6388 Mon Sep 17 00:00:00 2001 From: David Wu Date: Fri, 1 Sep 2017 13:44:09 +1200 Subject: [PATCH] Controls button in title screen now opens the key mapping menu. #story[1197] --- .../main/java/visualiser/Controllers/TitleController.java | 2 +- racevisionGame/src/main/java/visualiser/app/App.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index 32e033c8..94fff748 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -89,7 +89,7 @@ public class TitleController extends Controller { */ public void controlBtnPressed(){ FXMLLoader loader = new FXMLLoader(); - loader.setLocation(getClass().getResource("/visualiser/scenes/controls.fxml")); + loader.setLocation(getClass().getResource("/visualiser/scenes/keyBindings.fxml")); Parent layout; try { layout = loader.load(); diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java index 9a1a7132..ac063b94 100644 --- a/racevisionGame/src/main/java/visualiser/app/App.java +++ b/racevisionGame/src/main/java/visualiser/app/App.java @@ -168,14 +168,6 @@ public class App extends Application { System.exit(0); } }); - - // TODO: remove later, just for testing - Parent root2 = FXMLLoader.load(getClass().getResource - ("/visualiser/scenes/keyBindings.fxml")); - Stage stage2 = new Stage(); - stage2.setScene(new Scene(root2)); - stage2.centerOnScreen(); - stage2.show(); } /**