From ad103cfb49aacc6653b41f744514c3339a1f6b7f Mon Sep 17 00:00:00 2001
From: fallahn <matty_styles@hotmail.com>
Date: Fri, 25 Aug 2023 20:40:16 +0100
Subject: [PATCH] update chat sound effects

---
 samples/golf/buildnumber.h                  | 4 ++--
 samples/golf/src/golf/GolfSoundDirector.cpp | 5 +++++
 samples/golf/src/golf/GolfSoundDirector.hpp | 1 +
 samples/golf/src/golf/GolfState.cpp         | 3 +++
 samples/golf/src/golf/MessageIDs.hpp        | 3 ++-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/samples/golf/buildnumber.h b/samples/golf/buildnumber.h
index 3689ed291..8c2b3700f 100644
--- a/samples/golf/buildnumber.h
+++ b/samples/golf/buildnumber.h
@@ -3,7 +3,7 @@
 #ifndef BUILD_NUMBER_H_ 
 #define BUILD_NUMBER_H_ 
 
-#define BUILDNUMBER 1408
-#define BUILDNUMBER_STR "1408" 
+#define BUILDNUMBER 1412
+#define BUILDNUMBER_STR "1412" 
 
 #endif /* BUILD_NUMBER_H_ */
diff --git a/samples/golf/src/golf/GolfSoundDirector.cpp b/samples/golf/src/golf/GolfSoundDirector.cpp
index 824951db7..60674271d 100644
--- a/samples/golf/src/golf/GolfSoundDirector.cpp
+++ b/samples/golf/src/golf/GolfSoundDirector.cpp
@@ -164,6 +164,7 @@ GolfSoundDirector::GolfSoundDirector(cro::AudioResource& ar)
         "assets/golf/sound/ambience/foot04.wav",
 
         "assets/golf/sound/bad.wav",
+        "assets/golf/sound/tutorial_appear.wav",
 
         "assets/golf/sound/ambience/crowd_clear_throat.wav",
         "assets/golf/sound/ambience/crowd_cough.wav",
@@ -577,6 +578,10 @@ void GolfSoundDirector::handleMessage(const cro::Message& msg)
                 playSound(AudioID::BadSport, glm::vec3(0.f), 0.8f).getComponent<cro::AudioEmitter>().setMixerChannel(MixerChannel::Effects);
                 playSoundDelayed(AudioID::NearMiss, glm::vec3(0.f), 1.f, 1.f, MixerChannel::Effects);
             }
+            else if (data.type == SceneEvent::ChatMessage)
+            {
+                playSound(AudioID::Chat, glm::vec3(0.f), 0.3f).getComponent<cro::AudioEmitter>().setMixerChannel(MixerChannel::Menu);
+            }
         }
         break;
         }
diff --git a/samples/golf/src/golf/GolfSoundDirector.hpp b/samples/golf/src/golf/GolfSoundDirector.hpp
index 832b06fd5..f83748e9a 100644
--- a/samples/golf/src/golf/GolfSoundDirector.hpp
+++ b/samples/golf/src/golf/GolfSoundDirector.hpp
@@ -152,6 +152,7 @@ class GolfSoundDirector final : public SoundEffectsDirector
             Foot03,
             Foot04,
             BadSport,
+            Chat,
 
             CrowdClearThroat,
             CrowdCough,
diff --git a/samples/golf/src/golf/GolfState.cpp b/samples/golf/src/golf/GolfState.cpp
index 214fbfc01..3ba9ea2da 100644
--- a/samples/golf/src/golf/GolfState.cpp
+++ b/samples/golf/src/golf/GolfState.cpp
@@ -5492,6 +5492,9 @@ void GolfState::handleNetEvent(const net::NetEvent& evt)
         default: break;
         case PacketID::ChatMessage:
             m_textChat.handlePacket(evt.packet);
+            {
+                postMessage<SceneEvent>(MessageID::SceneMessage)->type = SceneEvent::ChatMessage;
+            }
             break;
         case PacketID::FlagHit:
         {
diff --git a/samples/golf/src/golf/MessageIDs.hpp b/samples/golf/src/golf/MessageIDs.hpp
index 8fb5d1ef6..605ae7cf7 100644
--- a/samples/golf/src/golf/MessageIDs.hpp
+++ b/samples/golf/src/golf/MessageIDs.hpp
@@ -105,7 +105,8 @@ struct SceneEvent
         PlayerIdle,
         PlayerRotate,
         PlayerBad,
-        MinimapUpdated
+        MinimapUpdated,
+        ChatMessage
     }type = TransitionComplete;
 
     //union