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

Lagt til en case for gamestate of fikset imports.

Browse Source
This commit is contained in:
Steinar Aalstad Lillesund
2020-04-14 16:08:50 +02:00
parent bd8090a987
commit 23406f395b
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java
View File

@@ -1,4 +1,4 @@
package inf112.fiasko.roborally.game_wrapper.screens;
package inf112.fiasko.roborally.gamewrapper.screens;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
@@ -15,8 +15,8 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.utils.viewport.FitViewport;
import com.badlogic.gdx.utils.viewport.Viewport;
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
import inf112.fiasko.roborally.game_wrapper.SimpleButton;
import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
import inf112.fiasko.roborally.gamewrapper.SimpleButton;
import inf112.fiasko.roborally.objects.IDeck;
import inf112.fiasko.roborally.objects.ProgrammingCard;
import inf112.fiasko.roborally.objects.ProgrammingCardDeck;
@@ -92,10 +92,6 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
stage.setViewport(viewport);
inputMultiplexer.addProcessor(this);
inputMultiplexer.addProcessor(stage);
if(roboRallyWrapper.roboRallyGame.getClient()==null){
roboRallyWrapper.roboRallyGame.setClient(roboRallyWrapper.client);
roboRallyWrapper.roboRallyGame.setServer(roboRallyWrapper.server);
}
}
/**

17
src/main/java/inf112/fiasko/roborally/game_wrapper/screens/LoadingScreen.java → src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java
View File

@@ -1,12 +1,12 @@
package inf112.fiasko.roborally.game_wrapper.screens;
package inf112.fiasko.roborally.gamewrapper.screens;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.utils.viewport.ExtendViewport;
import com.badlogic.gdx.utils.viewport.Viewport;
import inf112.fiasko.roborally.element_properties.GameState;
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
import inf112.fiasko.roborally.elementproperties.GameState;
import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
/**
* This screen is used to wait for something
@@ -17,8 +17,6 @@ public class LoadingScreen extends AbstractScreen {
private final OrthographicCamera camera;
private final Viewport viewport;
private long startTime;
private GameState initialGameState;
/**
@@ -30,10 +28,10 @@ public class LoadingScreen extends AbstractScreen {
camera = new OrthographicCamera();
camera.setToOrtho(false, applicationWidth, applicationHeight);
viewport = new ExtendViewport(applicationWidth, applicationHeight, camera);
startTime = System.currentTimeMillis();
}
@Override
public void render(float delta) {
Gdx.gl.glClearColor(0f, 0f, 0f, 0f);
@@ -54,6 +52,12 @@ public class LoadingScreen extends AbstractScreen {
private void handleScreenChange() {
switch (initialGameState) {
case BEGINNING_OF_GAME:
if(roboRallyWrapper.roboRallyGame.getClient()==null){
roboRallyWrapper.roboRallyGame.setClient(roboRallyWrapper.client);
roboRallyWrapper.roboRallyGame.setServer(roboRallyWrapper.server);
}
case SENDING_CARDS:
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getBoardActiveScreen(this.roboRallyWrapper));
break;
@@ -67,7 +71,6 @@ public class LoadingScreen extends AbstractScreen {
@Override
public void show() {
startTime = System.currentTimeMillis();
if (roboRallyWrapper.roboRallyGame == null){
initialGameState = GameState.INITIAL_SETUP;
}