From b415ce385841946a764c55fd3d673286e1e01f1f Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Wed, 17 Jan 2024 17:38:25 +0100
Subject: [PATCH] update(Controller): minor fixes
---
.../battlearena/Controller/MainMenuController.java | 7 ++++++-
.../battlearena/Controller/MapSelectionController.java | 2 +-
src/main/resources/fxml/MultiplayerCreate.fxml | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
index c71e7fc4..83a6d92e 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
@@ -1,6 +1,8 @@
package de.hdm_stuttgart.battlearena.Controller;
import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
+import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Exceptions.DatabaseException;
+import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Persistence;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
@@ -17,6 +19,7 @@ public class MainMenuController implements Initializable {
@FXML
private Button exitButton;
private final SceneLoader sceneLoader = new SceneLoader();
+ private final Persistence persistence = Persistence.getInstance();
private void switchScene(String name) {
parent.getChildren().clear();
@@ -44,7 +47,9 @@ public class MainMenuController implements Initializable {
}
@FXML
- private void exit() {
+ private void exit() throws DatabaseException {
+ persistence.savePlayerStatistics();
+ persistence.saveSettings();
Stage stage = (Stage) exitButton.getScene().getWindow();
stage.close();
}
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java
index b2752dab..d8213343 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapSelectionController.java
@@ -56,7 +56,7 @@ public class MapSelectionController implements Initializable {
@FXML
private void gameScene() {
try {
-// RuntimeInfo.getInstance().setGameMap(selectedMap, true);
+ RuntimeInfo.getInstance().setGameMap(coreMaps.get(selectedMap));
MusicPlayerSingleton.getInstance().getMediaPlayer().dispose();
parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/GameScene.fxml"))));
} catch (IOException e) {
diff --git a/src/main/resources/fxml/MultiplayerCreate.fxml b/src/main/resources/fxml/MultiplayerCreate.fxml
index 3cf21a91..f95e2126 100644
--- a/src/main/resources/fxml/MultiplayerCreate.fxml
+++ b/src/main/resources/fxml/MultiplayerCreate.fxml
@@ -47,7 +47,7 @@
<Insets top="20.0" />
</VBox.margin>
</AnchorPane>
- <Button mnemonicParsing="false" text="Start" />
+ <Button mnemonicParsing="false" onAction="#start" text="Start" />
<Button mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane VBox.vgrow="ALWAYS" />
<Pane VBox.vgrow="ALWAYS" />
--
GitLab