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

endre til et annet screen

Browse Source
This commit is contained in:
Tobydrama 2020-04-14 14:50:45 +02:00
parent 0ddf309e70
commit cafde5245d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/LoadingScreen.java
View File

@ -47,13 +47,17 @@ public class LoadingScreen extends AbstractScreen {
roboRallyWrapper.batch.end(); roboRallyWrapper.batch.end();
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
//TODO: Allow to set any condition and next screen //TODO: Allow to set any condition and next screen
if (roboRallyWrapper.roboRallyGame.getGameState() != initialGameState) { if (roboRallyWrapper.roboRallyGame != null && roboRallyWrapper.roboRallyGame.getGameState() != initialGameState ) {
handleScreenChange(); handleScreenChange();
} }
} }
private void handleScreenChange() { private void handleScreenChange() {
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getBoardActiveScreen(this.roboRallyWrapper)); switch (initialGameState) {
case SENDING_CARDS:
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getBoardActiveScreen(this.roboRallyWrapper));
break;
}
} }
@Override @Override
@ -64,7 +68,12 @@ public class LoadingScreen extends AbstractScreen {
@Override @Override
public void show() { public void show() {
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
initialGameState = roboRallyWrapper.roboRallyGame.getGameState(); if (roboRallyWrapper.roboRallyGame == null){
initialGameState = GameState.INITIAL_SETUP;
}
else {
initialGameState = roboRallyWrapper.roboRallyGame.getGameState();
}
} }
} }