diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-09-20 09:13:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 09:13:24 -0500 |
| commit | 849f91d991bf0e95d579df268e9ab358e09b1ac1 (patch) | |
| tree | 9ada9e26f1dc92ad0d1a53ab292abfeced13fa34 | |
| parent | aa6f073ea87c5537b35f00293766dcdd74da63a1 (diff) | |
| parent | 4562bcd82fffcd15813524f9bafc235649261bb4 (diff) | |
Merge pull request #299 from AttorneyOnline/fix-283
Fix shout sounds not being initialized from the default theme when current theme lacks them
| -rw-r--r-- | src/aosfxplayer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp index 8c4f3c86..1a0e2d2f 100644 --- a/src/aosfxplayer.cpp +++ b/src/aosfxplayer.cpp @@ -37,11 +37,16 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout, QString misc_path = ""; QString char_path = ""; + QString theme_path = ""; 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/" + 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 != "") char_path = 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; else if (file_exists(misc_path)) f_path = misc_path; + else if (shout != "" && file_exists(theme_path)) //only check here for shouts + f_path = theme_path; else f_path = sound_path; |