update options label for Steam Deck

tweak colour opacity
fallahn · Apr 27, 2024 · 6fd65c3 · 6fd65c3
1 parent 8e17bef
commit 6fd65c3
Show file tree

Hide file tree

Showing 6 changed files with 220 additions and 214 deletions.
diff --git a/samples/golf/buildnumber.h b/samples/golf/buildnumber.h
@@ -3,7 +3,7 @@
 #ifndef BUILD_NUMBER_H_ 
 #define BUILD_NUMBER_H_ 
 
-#define BUILDNUMBER 5448
-#define BUILDNUMBER_STR "5448" 
+#define BUILDNUMBER 5455
+#define BUILDNUMBER_STR "5455" 
 
 #endif /* BUILD_NUMBER_H_ */
diff --git a/samples/golf/src/golf/GolfState.cpp b/samples/golf/src/golf/GolfState.cpp
@@ -6255,7 +6255,8 @@ void GolfState::startFlyBy()
 
                 //play the transition music
                 if (m_sharedData.gameMode == GameMode::Tutorial
-                    && cro::AudioMixer::getVolume(MixerChannel::UserMusic) < 0.01f)
+                    && cro::AudioMixer::getVolume(MixerChannel::UserMusic) < 0.01f
+                    && cro::AudioMixer::getVolume(MixerChannel::Music) != 0)
                 {
                     m_cameras[CameraID::Player].getComponent<cro::AudioEmitter>().play();
                 }
@@ -6279,7 +6280,8 @@ void GolfState::startFlyBy()
                     showScoreboard(true);
                     m_newHole = true;
 
-                    if (cro::AudioMixer::getVolume(MixerChannel::UserMusic) < 0.01f)
+                    if (cro::AudioMixer::getVolume(MixerChannel::UserMusic) < 0.01f
+                        && cro::AudioMixer::getVolume(MixerChannel::Music) != 0)
                     {
                         m_cameras[CameraID::Player].getComponent<cro::AudioEmitter>().play();
                     }