From dcb0ab896c0c320045a9bea519f5e26d6ddd0e8d Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Thu, 25 Jan 2024 16:42:51 +0100
Subject: [PATCH] fix(controller): minor fixes after merge
---
.../battlearena/Controller/MenuBorderPaneController.java | 2 +-
src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
index 7ae68807..75315ab5 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
@@ -57,7 +57,7 @@ public class MenuBorderPaneController implements Initializable {
imgLeft.setFitWidth(imageWidth);
imgLeft.setPreserveRatio(true);
-// backgroundMusic("cocBackgroundMusicTest.mp3");
+ backgroundMusic("cocBackgroundMusicTest.mp3");
easterEgg();
// shuffle meme order
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java b/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
index b6074e3a..3c296f75 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java
@@ -38,7 +38,7 @@ public class Driver extends Application {
Font.loadFont(getClass().getResourceAsStream("/fonts/Arthemis-mLA22.ttf"), 50);
Font.loadFont(getClass().getResourceAsStream("/fonts/ShadowsIntoLight-Regular.ttf"), 50);
- Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/GameScene.fxml")));
+ Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/Intro.fxml")));
Scene scene = new Scene(root);
--
GitLab