Skip to content
Snippets Groups Projects
Commit f04affe5 authored by Tran Peter's avatar Tran Peter
Browse files

fix(music player): fix game state not setting when credits are playing

parent 6f34ab7d
No related branches found
No related tags found
6 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!54Update: coreMaps.json (added new maps),!48Development,!47Merge ui into development
package de.hdm_stuttgart.battlearena.Controller;
import de.hdm_stuttgart.battlearena.Controller.Enum.GameState;
import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer;
import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.RuntimeInfo;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
......@@ -42,6 +44,7 @@ public class CreditsController implements Initializable {
private void videoEnd() {
try {
// I don't know how to return to the options scene, so it just goes back to the main menu :(
RuntimeInfo.getInstance().setGameState(GameState.MENU);
mediaPlayer.dispose();
parent.getChildren().clear();
parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/MenuBorderPane.fxml"))));
......
......@@ -75,7 +75,7 @@ public class LoadingScreenController implements Initializable {
Thread loadStatistics = new Thread(() -> {
try {
Thread.sleep(4000);
Thread.sleep(5000);
loadStatistics();
} catch (IOException e) {
throw new RuntimeException();
......
package de.hdm_stuttgart.battlearena.Controller;
import de.hdm_stuttgart.battlearena.Controller.Enum.GameState;
import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Persistence;
import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.RuntimeInfo;
import de.hdm_stuttgart.battlearena.Model.Sound.MusicPlayer;
import de.hdm_stuttgart.battlearena.Model.Sound.SoundEffects;
import javafx.fxml.FXML;
......@@ -34,6 +36,7 @@ public class SettingsController implements Initializable {
@FXML
private void creditScene() throws IOException {
RuntimeInfo.getInstance().setGameState(GameState.NONE);
parent.getChildren().clear();
parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/credits.fxml"))));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment