diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp index 4070f150..c2fe7480 100644 --- a/rwengine/src/engine/GameData.cpp +++ b/rwengine/src/engine/GameData.cpp @@ -520,9 +520,12 @@ bool GameData::loadAudioClip(const std::string& name, const std::string& fileNam if ( ! loaded) { logger->error("Data", "Error loading audio clip "+ filePath); + return false; } - return loaded; + engine->missionAudio = name; + + return true; } void GameData::loadSplash(const std::string &name) diff --git a/rwengine/src/script/modules/GameModule.cpp b/rwengine/src/script/modules/GameModule.cpp index f69c7c0f..b86b6035 100644 --- a/rwengine/src/script/modules/GameModule.cpp +++ b/rwengine/src/script/modules/GameModule.cpp @@ -790,8 +790,6 @@ void game_load_audio(const ScriptArguments& args) std::string name = args[0].string; std::transform(name.begin(), name.end(), name.begin(), ::tolower); - args.getWorld()->missionAudio = name; - if ( ! args.getWorld()->data->loadAudioClip(name, name + ".wav")) { if ( ! args.getWorld()->data->loadAudioClip(name, name + ".mp3")) { args.getWorld()->logger->error("SCM", "Failed to load audio: " + name);