diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java index 39b6ea7e..dc419bb7 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java @@ -168,7 +168,7 @@ public void enter(MdgaState state) { app.getNotificationSynchronizer().addTestNotification(new TskSelectNotification(Color.CYBER, "blablabupp", false)); app.getNotificationSynchronizer().addTestNotification(new TskSelectNotification(Color.ARMY, "Spieler 2", false)); - lobbyView.setReady(Color.ARMY, false); + lobbyView.setReady(Color.ARMY, true); } } } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java index 963e0e64..32a87c19 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java @@ -46,9 +46,9 @@ public GameView(MdgaApp app) { super(app); cheatButton = new ButtonRight(app, settingsNode, () -> app.getModelSynchronize().enter(MdgaState.CEREMONY), "CHEAT", 1); - leaveButton = new ButtonLeft(app, settingsNode, () -> app.getModelSynchronize().leave(), "Spiel verlassen", 1); - confirmButton = new ButtonRight(app, settingsNode, () -> app.getModelSynchronize().confirm(), "Bestätigen", 1); + + confirmButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Bestätigen", 1); fpp = new FilterPostProcessor(app.getAssetManager()); this.camera = new CameraHandler(app, fpp); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java index 3adb6dd3..7f2a7569 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java @@ -150,12 +150,12 @@ public void setReady(Color color, boolean isReady) { button.setReady(isReady); - if(button.getTaken() != LobbyButton.Taken.SELF) { - app.getAcousticHandler().playSound(MdgaSound.OTHER_READY); - } - if(!isReady) { app.getAcousticHandler().playSound(MdgaSound.NOT_READY); + } else { + if(button.getTaken() != LobbyButton.Taken.SELF) { + app.getAcousticHandler().playSound(MdgaSound.OTHER_READY); + } } }