From 14672966357b88d262240586be61bf3d51ad89ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Fam=C3=A0?= Date: Wed, 6 Sep 2023 21:45:27 +0200 Subject: [PATCH] Fix load_init_bank_at_startup compatibility Issue with use_soundbank_names setting An incompatibility between the load_init_bank_at_startup setting and the use_soundbank_names setting was identified. When load_init_bank_at_startup was enabled, the integration attempted to load the Init bank using its ID, conflicting with the use_soundbank_names setting. This commit fixes this issue. --- addons/Wwise/native/src/wwise_gdextension.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/Wwise/native/src/wwise_gdextension.cpp b/addons/Wwise/native/src/wwise_gdextension.cpp index 130329a3..0e9295e9 100644 --- a/addons/Wwise/native/src/wwise_gdextension.cpp +++ b/addons/Wwise/native/src/wwise_gdextension.cpp @@ -227,10 +227,20 @@ void Wwise::init() bool load_init_bank_at_startup = get_platform_project_setting(WWISE_COMMON_USER_SETTINGS_PATH + "load_init_bank_at_startup"); + bool use_soundbank_names = get_platform_project_setting(WWISE_COMMON_USER_SETTINGS_PATH + "use_soundbank_names"); + if (load_init_bank_at_startup) { - AkUInt32 initBankID = AK::SoundEngine::GetIDFromString("Init"); - load_bank_id(initBankID); + if (use_soundbank_names) + { + String init_bank_name = "Init"; + load_bank(init_bank_name); + } + else + { + AkUInt32 initBankID = AK::SoundEngine::GetIDFromString("Init"); + load_bank_id(initBankID); + } } }