Fjerner MainMenuScreen fra mulige skjermer

This commit is contained in:
Kristian Knarvik 2020-04-07 14:16:00 +02:00
parent f8c9d256c4
commit 9fa4ac7b56

View File

@ -1,15 +1,15 @@
package inf112.fiasko.roborally.game_wrapper; package inf112.fiasko.roborally.game_wrapper;
import inf112.fiasko.roborally.game_wrapper.screens.*;
/** /**
* Keeps track of screen instances * Keeps track of screen instances
*/ */
public class ScreenManager { public class ScreenManager {
private MainMenuScreen mainMenuScreen;
private BoardActiveScreen boardActiveScreen; private BoardActiveScreen boardActiveScreen;
private CardChoiceScreen cardChoiceScreen; private CardChoiceScreen cardChoiceScreen;
private PowerDownScreen powerDownScreen; private PowerDownScreen powerDownScreen;
private LoadingScreen loadingScreen; private LoadingScreen loadingScreen;
private StartMenuScreen startMenuScreen;
private UsernameScreen usernameScreen; private UsernameScreen usernameScreen;
private IPAddressScreen ipAddressScreen; private IPAddressScreen ipAddressScreen;
private LobbyScreen lobbyScreen; private LobbyScreen lobbyScreen;
@ -46,11 +46,8 @@ public class ScreenManager {
return usernameScreen; return usernameScreen;
} }
public synchronized StartMenuScreen getStartMenuScreen(RoboRallyWrapper roboRallyWrapper) { synchronized StartMenuScreen getStartMenuScreen(RoboRallyWrapper roboRallyWrapper) {
if (this.startMenuScreen == null) { return new StartMenuScreen(roboRallyWrapper);
this.startMenuScreen = new StartMenuScreen(roboRallyWrapper);
}
return startMenuScreen;
} }
public synchronized LoadingScreen getLoadingScreen(RoboRallyWrapper roboRallyWrapper) { public synchronized LoadingScreen getLoadingScreen(RoboRallyWrapper roboRallyWrapper) {
@ -60,18 +57,6 @@ public class ScreenManager {
return loadingScreen; 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 * Gets an instance of the board active screen
* @param roboRallyWrapper The robo rally launcher instance to use * @param roboRallyWrapper The robo rally launcher instance to use