From 0d22df0fab709b18d8ef26a4f308d7ad19f4dde5 Mon Sep 17 00:00:00 2001 From: MickWerf Date: Sun, 7 Jun 2020 17:54:47 +0200 Subject: [PATCH] Fixed create and removed souts --- .../src/netwerkprog/game/client/MainGame.java | 23 +++++++++---------- .../game/client/game/connections/Client.java | 2 -- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java index 1695cec..8fd7ea2 100644 --- a/core/src/netwerkprog/game/client/MainGame.java +++ b/core/src/netwerkprog/game/client/MainGame.java @@ -92,15 +92,11 @@ public class MainGame extends Game implements ClientCallback { screenHeight = Gdx.graphics.getHeight(); frameRate = new FrameRate(); camera = new OrthographicCamera(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); - camera.position.set(screenWidth / 2, screenHeight / 2, 0); - camera.viewportWidth = screenWidth / 2; - camera.viewportHeight = screenHeight / 2; - camera.update(); - gameInputProcessor = new GameInputProcessor(camera); - batch = new SpriteBatch(); + textRenderer = new TextRenderer(); font = new BitmapFont(); layout = new GlyphLayout(); - textRenderer = new TextRenderer(); + assets = new AssetManager(); + String[] strings = new String[]{ "#########################", "#xxxx # #", @@ -117,13 +113,16 @@ public class MainGame extends Game implements ClientCallback { "#########################" }; map = new Map(strings); - mapRenderer = new MapRenderer(map, 32, batch, camera); - assets = new AssetManager(); - screenWidth = Gdx.graphics.getWidth(); - screenHeight = Gdx.graphics.getHeight(); + gameInputProcessor = new GameInputProcessor(camera); Gdx.input.setInputProcessor(gameInputProcessor); + mapRenderer = new MapRenderer(map, 32, batch, camera); + camera.position.set(screenWidth / 2, screenHeight / 2, 0); + camera.viewportWidth = screenWidth / 2; + camera.viewportHeight = screenHeight / 2; + camera.update(); + setGamestate(GAMESTATE.SELECTING_FACTION); + connectToServer(); playSong(); - } /** diff --git a/core/src/netwerkprog/game/client/game/connections/Client.java b/core/src/netwerkprog/game/client/game/connections/Client.java index e376791..a97ff5b 100644 --- a/core/src/netwerkprog/game/client/game/connections/Client.java +++ b/core/src/netwerkprog/game/client/game/connections/Client.java @@ -106,11 +106,9 @@ public class Client implements Runnable { * @param in The inputStream */ public void receive(ObjectInputStream in) { - System.out.println("[CLIENT RECEIVE] connected: " + isConnected); while (isConnected) { try { Object object = in.readObject(); - System.out.println("[CLIENT] got object " + object); if (object instanceof Data) { callback.onDataReceived((Data) object); }