From c2dc12ad87533f0aa1901eada744af81c910e965 Mon Sep 17 00:00:00 2001 From: Tobydrama Date: Mon, 6 Apr 2020 15:16:59 +0200 Subject: [PATCH] =?UTF-8?q?fikk=20skjermen=20til=20=C3=A5=20g=C3=A5=20til?= =?UTF-8?q?=20forskjelige=20skjermer=20utifra=20om=20du=20var=20server=20e?= =?UTF-8?q?ller=20klient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fiasko/roborally/game_wrapper/UsernameScreen.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/UsernameScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/UsernameScreen.java index c799297..256bc7b 100644 --- a/src/main/java/inf112/fiasko/roborally/game_wrapper/UsernameScreen.java +++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/UsernameScreen.java @@ -35,7 +35,12 @@ public class UsernameScreen extends AbstractScreen { @Override public void touchUp(InputEvent e, float x, float y, int point, int button){ System.out.println(txtinput.getText()); - roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper)); + if (roboRallyWrapper.server == null) { + roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper)); + } + else{ + roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLobbyScreen(roboRallyWrapper)); + } } }); txtinput = new TextField("",skin);