Spectator no longer gets spammed with sound effects

mafia-rust · Jan 7, 2025 · b663dc9 · b663dc9
1 parent aa98b92
commit b663dc9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/client/src/game/gameState.d.tsx b/client/src/game/gameState.d.tsx
@@ -52,9 +52,11 @@ export type PlayerClientType = {
 }
 
 type GameState = {
-    stateType: "game"
+    stateType: "game",
     roomCode: number,
     lobbyName: string,
+
+    initialized: boolean,
 
     myId: number | null,
 

diff --git a/client/src/game/gameState.tsx b/client/src/game/gameState.tsx
@@ -40,6 +40,8 @@ export function createGameState(): GameState {
         roomCode: 0,
         lobbyName: "",
 
+        initialized: false,
+
         myId: null,
 
         chatMessages : [],

diff --git a/client/src/game/messageListener.tsx b/client/src/game/messageListener.tsx
@@ -235,6 +235,9 @@ export default function messageListener(packet: ToClientPacket){
         break;
         case "gameInitializationComplete": {
             const isSpectator = GAME_MANAGER.getMySpectator();
+            if(GAME_MANAGER.state.stateType === "game"){
+                GAME_MANAGER.state.initialized = true;
+            }
             if(isSpectator){
                 ANCHOR_CONTROLLER?.setContent(<SpectatorGameScreen/>);
             }else{
@@ -482,10 +485,12 @@ export default function messageListener(packet: ToClientPacket){
                     }
                 }
 
-                for(let chatMessage of packet.chatMessages){
-                    let audioSrc = chatMessageToAudio(chatMessage);
-                    if(audioSrc)
-                        AudioController.queueFile(audioSrc);
+                if (GAME_MANAGER.state.stateType !== "game" || GAME_MANAGER.state.initialized === true) {
+                    for(let chatMessage of packet.chatMessages){
+                        let audioSrc = chatMessageToAudio(chatMessage);
+                        if(audioSrc)
+                            AudioController.queueFile(audioSrc);
+                    }
                 }
             }
         break;

diff --git a/client/src/menu/game/gameScreenContent/ChatMenu.tsx b/client/src/menu/game/gameScreenContent/ChatMenu.tsx
@@ -12,7 +12,6 @@ import Icon from "../../../components/Icon";
 import StyledText, { KeywordDataMap, PLAYER_KEYWORD_DATA, PLAYER_SENDER_KEYWORD_DATA } from "../../../components/StyledText";
 import { useGameState, useLobbyOrGameState, usePlayerState } from "../../../components/useHooks";
 import { Virtuoso } from 'react-virtuoso';
-import Select from "../../../components/Select";
 
 
 export default function ChatMenu(): ReactElement {