Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #299 from AttorneyOnline/fix-283

Browse Source 
Fix shout sounds not being initialized from the default theme when current theme lacks them
This commit is contained in:
oldmud0 2020-09-20 09:13:24 -05:00 committed by GitHub
commit 849f91d991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/aosfxplayer.cpp
View File

@ -37,11 +37,16 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout,
QString misc_path = ""; QString misc_path = "";
QString char_path = ""; QString char_path = "";
QString theme_path = "";
QString sound_path = ao_app->get_sfx_suffix(ao_app->get_sounds_path(p_sfx)); QString sound_path = ao_app->get_sfx_suffix(ao_app->get_sounds_path(p_sfx));
if (shout != "") if (shout != "") {
misc_path = ao_app->get_sfx_suffix(ao_app->get_base_path() + "misc/" + misc_path = ao_app->get_sfx_suffix(ao_app->get_base_path() + "misc/" +
shout + "/" + p_sfx); shout + "/" + p_sfx);
theme_path = ao_app->get_sfx_suffix(ao_app->get_theme_path(p_sfx));
if (!file_exists(theme_path))
theme_path = ao_app->get_sfx_suffix(ao_app->get_default_theme_path(p_sfx));
}
if (p_char != "") if (p_char != "")
char_path = char_path =
ao_app->get_sfx_suffix(ao_app->get_character_path(p_char, p_sfx)); ao_app->get_sfx_suffix(ao_app->get_character_path(p_char, p_sfx));
@ -52,6 +57,8 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout,
f_path = char_path; f_path = char_path;
else if (file_exists(misc_path)) else if (file_exists(misc_path))
f_path = misc_path; f_path = misc_path;
else if (shout != "" && file_exists(theme_path)) //only check here for shouts
f_path = theme_path;
else else
f_path = sound_path; f_path = sound_path;