From a38366600cea7b2b29795e416f662ba8792c028e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Brennf=C3=B6rder?= Date: Mon, 14 Oct 2024 11:12:07 +0200 Subject: [PATCH] fixed a bug where the SHIPDESTROYED Sound was played everytime --- Dokumente/BattleshipDiagramm.drawio | 308 +++++++++--------- .../game/client/AnimationState.java | 3 +- 2 files changed, 155 insertions(+), 156 deletions(-) diff --git a/Dokumente/BattleshipDiagramm.drawio b/Dokumente/BattleshipDiagramm.drawio index 69d42cff..64fb63ce 100644 --- a/Dokumente/BattleshipDiagramm.drawio +++ b/Dokumente/BattleshipDiagramm.drawio @@ -1,37 +1,37 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -39,27 +39,27 @@ - + - + - + - + - + - + - + @@ -67,10 +67,10 @@ - + - + @@ -78,16 +78,16 @@ - + - + - + - + @@ -95,13 +95,13 @@ - + - + - + @@ -109,74 +109,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -184,13 +184,13 @@ - + - + - + @@ -198,21 +198,21 @@ - + - + - + - + - + @@ -220,10 +220,10 @@ - + - + @@ -231,21 +231,21 @@ - + - + - + - + - + @@ -254,62 +254,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -318,7 +318,7 @@ - + @@ -327,12 +327,12 @@ - + - + @@ -340,25 +340,25 @@ - + - + - + - + - + - + @@ -366,10 +366,10 @@ - + - + @@ -377,21 +377,21 @@ - + - + - + - + @@ -399,15 +399,15 @@ - + - + - + @@ -416,31 +416,31 @@ - + - + - + - + - + - + - + @@ -449,18 +449,18 @@ - + - + - + - + @@ -468,7 +468,7 @@ - + @@ -477,18 +477,18 @@ - + - + - + - + @@ -497,39 +497,39 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -537,51 +537,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -590,18 +590,18 @@ - + - + - + - + @@ -610,40 +610,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Projekte/battleship/model/src/main/java/pp/battleship/game/client/AnimationState.java b/Projekte/battleship/model/src/main/java/pp/battleship/game/client/AnimationState.java index e4da00c4..043b0ee4 100644 --- a/Projekte/battleship/model/src/main/java/pp/battleship/game/client/AnimationState.java +++ b/Projekte/battleship/model/src/main/java/pp/battleship/game/client/AnimationState.java @@ -109,7 +109,6 @@ private void playSound(EffectMessage msg) { else if (msg.getDestroyedShip() == null) logic.playSound(Sound.EXPLOSION); else - logic.playSound(Sound.EXPLOSION); - logic.playSound(Sound.DESTROYED_SHIP); + logic.playSound(Sound.DESTROYED_SHIP); } }