diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java index 29ee28ca..518feb52 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java @@ -318,5 +318,9 @@ public void afterGameCleanup() { ceremonyView.afterGameCleanup(); } + + public GameView getGameView(){ + return gameView; + } } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java index 26d0e769..8578b46e 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java @@ -74,8 +74,8 @@ private void handleLobby(Notification notification) { } else if(notification instanceof LobbyReadyNotification lobbyReadyNotification) { lobbyView.setReady(lobbyReadyNotification.getColor(), lobbyReadyNotification.isReady()); } else if (notification instanceof GameNotification n) { + app.getGameView().setOwnColor(n.getOwnColor()); app.enter(MdgaState.GAME); - ((GameView) app.getView()).setOwnColor(n.getOwnColor()); } else { throw new RuntimeException("notification not expected in lobby: " + notification.getClass().getName()); } 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 cbf9866d..973327c2 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 @@ -48,7 +48,6 @@ public GameView(MdgaApp app) { @Override public void onEnter() { - setOwnColor(Color.AIRFORCE); camera.init(ownColor); boardHandler.init(); guiHandler.init(ownColor); diff --git a/Projekte/mdga/client/src/main/resources/Images/particle/particle_cir.png b/Projekte/mdga/client/src/main/resources/Images/particle/particle_cir.png new file mode 100644 index 00000000..ef381886 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/Images/particle/particle_cir.png differ