Bugfix: don't play theme if music off (#43)

* Bugfix: don't play theme if music off Otherwise, it causes Access Violation error. * Fix PR code, update union-api submodule --------- Co-authored-by: damianut <damianas1999@gmail.com>
Silver-Ore-Team · Jul 7, 2024 · 2da6f23 · 2da6f23
1 parent eb2f161
commit 2da6f23
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/dependencies/union-api b/dependencies/union-api
diff --git a/docs/docs/reference/externals/index.md b/docs/docs/reference/externals/index.md
@@ -4,7 +4,7 @@
 
 ## <a href="#bassmusic_play">BassMusic_Play</a>
 
-Triggers an event to start a new music theme.
+Triggers an event to start a new music theme. If the player has turned off the music in the menu, the theme will not be played.
 
 ```dae
 func void BassMusic_Play(var string id)

diff --git a/src/Gothic/Externals.hpp b/src/Gothic/Externals.hpp
@@ -8,6 +8,12 @@ namespace GOTHIC_NAMESPACE
     {
         zSTRING id;
         parser->GetParameter(id);
+        if (zCMusicSystem::s_musicSystemDisabled)
+        {
+            static NH::Logger* log = NH::CreateLogger("zBassMusic::BassMusic_Play");
+            log->Error("Music system disabled.");
+            return 0;
+        }
         zCMusicTheme* theme = zmusic->LoadThemeByScript(id);
         zmusic->PlayTheme(theme, zMUS_THEME_VOL_DEFAULT, zMUS_TR_DEFAULT, zMUS_TRSUB_DEFAULT);
         return 0;