diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp index cce3cf4aec..f24bcd2d41 100644 --- a/Code/Legacy/CrySystem/SystemInit.cpp +++ b/Code/Legacy/CrySystem/SystemInit.cpp @@ -896,16 +896,14 @@ void CSystem::InitLocalization() if (auto console = AZ::Interface::Get(); console != nullptr) { AZ::CVarFixedString languageAudio; - if (auto result = console->GetCvarValue("g_languageAudio", languageAudio); result == AZ::GetValueResult::Success) + console->GetCvarValue("g_languageAudio", languageAudio); + if (languageAudio.empty()) { - if (languageAudio.size() == 0) - { - console->PerformCommand(AZStd::string::format("g_languageAudio %s", language.c_str()).c_str()); - } - else - { - language.assign(languageAudio.data(), languageAudio.size()); - } + console->PerformCommand(AZStd::string::format("g_languageAudio %s", language.c_str()).c_str()); + } + else + { + language.assign(languageAudio.data(), languageAudio.size()); } } OpenLanguageAudioPak(language); diff --git a/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp b/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp index 616a30994c..19038dc54c 100644 --- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp +++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp @@ -54,7 +54,9 @@ namespace AudioControls //-------------------------------------------------------------------------------------------// void CAudioWwiseLoader::LoadSoundBanks(const AZStd::string_view rootFolder, const AZStd::string_view subPath, bool isLocalized) { - auto foundFiles = Audio::FindFilesInPath(rootFolder, "*"); + AZ::IO::FixedMaxPath searchPath(rootFolder); + searchPath /= subPath; + auto foundFiles = Audio::FindFilesInPath(searchPath.Native(), "*"); bool isLocalizedLoaded = isLocalized; for (const auto& filePath : foundFiles) @@ -71,7 +73,7 @@ namespace AudioControls // same content (in the future we want to have a // consistency report to highlight if this is not the case) m_localizationFolder.assign(fileName.Native().data(), fileName.Native().size()); - LoadSoundBanks(rootFolder, m_localizationFolder, true); + LoadSoundBanks(searchPath.Native(), m_localizationFolder, true); isLocalizedLoaded = true; } } diff --git a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp index 4095e3bf84..e4933728d4 100644 --- a/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp +++ b/Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp @@ -2173,16 +2173,7 @@ namespace Audio { if (language) { - AZStd::string languageSubfolder; - - if (azstricmp(language, "english") == 0) - { - languageSubfolder = "english(us)"; - } - else - { - languageSubfolder = language; - } + AZStd::string languageSubfolder(language); languageSubfolder += "/";