EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-01-31 23:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Fjerner MainMenuScreen fra mulige skjermer

Browse Source
This commit is contained in:
Kristian Knarvik 2020-04-07 14:16:00 +02:00
parent f8c9d256c4
commit 9fa4ac7b56
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java
View File

@ -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