mirror of
https://github.com/inf112-v20/Fiasko.git
synced 2025-03-03 08:39:45 +01:00
Legger til bedre beskrivelser av hva som blir ventet på på LoadingScreen
This commit is contained in:
parent
f644386586
commit
dbf0774586
@ -34,7 +34,7 @@ public class LoadingScreen extends AbstractScreen {
|
|||||||
roboRallyWrapper.batch.setProjectionMatrix(camera.combined);
|
roboRallyWrapper.batch.setProjectionMatrix(camera.combined);
|
||||||
|
|
||||||
roboRallyWrapper.batch.begin();
|
roboRallyWrapper.batch.begin();
|
||||||
roboRallyWrapper.font.draw(roboRallyWrapper.batch, "Loading...", applicationWidth / 2f - 380 / 2f,
|
roboRallyWrapper.font.draw(roboRallyWrapper.batch, getLoadingText(), applicationWidth / 2f - 380 / 2f,
|
||||||
applicationHeight / 2f, 380, 1, true);
|
applicationHeight / 2f, 380, 1, true);
|
||||||
roboRallyWrapper.batch.end();
|
roboRallyWrapper.batch.end();
|
||||||
|
|
||||||
@ -44,6 +44,36 @@ public class LoadingScreen extends AbstractScreen {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the correct loading text to display according to the game's state
|
||||||
|
*
|
||||||
|
* @return Text explaining what the game is waiting for
|
||||||
|
*/
|
||||||
|
private String getLoadingText() {
|
||||||
|
if (roboRallyWrapper.roboRallyGame == null) {
|
||||||
|
if (roboRallyWrapper.server == null) {
|
||||||
|
return "Waiting for host to start the game...";
|
||||||
|
}
|
||||||
|
return "Loading...";
|
||||||
|
}
|
||||||
|
System.out.println(roboRallyWrapper.roboRallyGame.getGameState());
|
||||||
|
switch (roboRallyWrapper.roboRallyGame.getGameState()) {
|
||||||
|
case WAITING_FOR_OTHER_PLAYERS_PROGRAMS:
|
||||||
|
return "Waiting for other players to finish programming...";
|
||||||
|
case WAITING_FOR_CARDS_FROM_SERVER:
|
||||||
|
return "Waiting for new cards from the server...";
|
||||||
|
case BEGINNING_OF_GAME:
|
||||||
|
return "Initializing new turn...";
|
||||||
|
case CHOOSING_CARDS:
|
||||||
|
return "Waiting for screen change...";
|
||||||
|
case SKIP_STAY_IN_POWER_DOWN:
|
||||||
|
return "Waiting for players to choose whether to stay in power down...";
|
||||||
|
default:
|
||||||
|
return "Waiting for something...";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Changes to another screen depending on which state the game is in
|
* Changes to another screen depending on which state the game is in
|
||||||
*
|
*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user