From 693ade38f534f2f4ffd9d77391dca8a13d4d8044 Mon Sep 17 00:00:00 2001 From: Tobydrama Date: Tue, 14 Apr 2020 14:51:14 +0200 Subject: [PATCH] la til slik at den tar et deck i input --- .../roborally/game_wrapper/screens/CardChoiceScreen.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java index d8595a3..c567104 100644 --- a/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java +++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java @@ -19,6 +19,7 @@ import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper; import inf112.fiasko.roborally.game_wrapper.SimpleButton; import inf112.fiasko.roborally.objects.IDeck; import inf112.fiasko.roborally.objects.ProgrammingCard; +import inf112.fiasko.roborally.objects.ProgrammingCardDeck; import inf112.fiasko.roborally.utility.DeckLoaderUtil; import java.awt.*; @@ -44,12 +45,14 @@ public class CardChoiceScreen extends InputAdapter implements Screen { private final int maxCards; private final Stage stage; private final InputMultiplexer inputMultiplexer; + private ProgrammingCardDeck deck; /** * Instantiates a new card choice screen * @param roboRallyWrapper The Robo Rally wrapper which is parent of this screen */ - public CardChoiceScreen(final RoboRallyWrapper roboRallyWrapper) { + public CardChoiceScreen(final RoboRallyWrapper roboRallyWrapper, ProgrammingCardDeck deck) { + this.deck = deck; this.roboRallyWrapper = roboRallyWrapper; camera = new OrthographicCamera(); int applicationWidth = 600; @@ -89,6 +92,10 @@ 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); + } } /**