diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java index 0091314..4d058b0 100644 --- a/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java +++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java @@ -1,15 +1,15 @@ package inf112.fiasko.roborally.game_wrapper; +import inf112.fiasko.roborally.game_wrapper.screens.*; + /** * Keeps track of screen instances */ public class ScreenManager { - private MainMenuScreen mainMenuScreen; private BoardActiveScreen boardActiveScreen; private CardChoiceScreen cardChoiceScreen; private PowerDownScreen powerDownScreen; private LoadingScreen loadingScreen; - private StartMenuScreen startMenuScreen; private UsernameScreen usernameScreen; private IPAddressScreen ipAddressScreen; private LobbyScreen lobbyScreen; @@ -46,11 +46,8 @@ public class ScreenManager { return usernameScreen; } - public synchronized StartMenuScreen getStartMenuScreen(RoboRallyWrapper roboRallyWrapper) { - if (this.startMenuScreen == null) { - this.startMenuScreen = new StartMenuScreen(roboRallyWrapper); - } - return startMenuScreen; + synchronized StartMenuScreen getStartMenuScreen(RoboRallyWrapper roboRallyWrapper) { + return new StartMenuScreen(roboRallyWrapper); } public synchronized LoadingScreen getLoadingScreen(RoboRallyWrapper roboRallyWrapper) { @@ -60,18 +57,6 @@ public class ScreenManager { return loadingScreen; } - /** - * Gets an instance of the main menu screen - * @param roboRallyWrapper The robo rally launcher instance to use - * @return A main menu screen instance - */ - public synchronized MainMenuScreen getMainMenuScreen(RoboRallyWrapper roboRallyWrapper) { - if (this.mainMenuScreen == null) { - this.mainMenuScreen = new MainMenuScreen(roboRallyWrapper); - } - return mainMenuScreen; - } - /** * Gets an instance of the board active screen * @param roboRallyWrapper The robo rally launcher instance to use