diff options
| -rw-r--r-- | aoapplication.h | 2 | ||||
| -rw-r--r-- | aoblipplayer.cpp | 2 | ||||
| -rw-r--r-- | aosfxplayer.cpp | 4 | ||||
| -rw-r--r-- | path_functions.cpp | 4 | ||||
| -rw-r--r-- | text_file_functions.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/aoapplication.h b/aoapplication.h index 202a1b01..bb3067ec 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -102,7 +102,7 @@ public: QString get_default_theme_path(QString p_file); QString get_character_path(QString p_character, QString p_file); QString get_character_emotions_path(QString p_character, QString p_file); - QString get_sounds_path(); + QString get_sounds_path(QString p_file); QString get_music_path(QString p_song); QString get_background_path(QString p_file); QString get_default_background_path(QString p_file); diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp index 5e3929e2..1e33236d 100644 --- a/aoblipplayer.cpp +++ b/aoblipplayer.cpp @@ -16,7 +16,7 @@ AOBlipPlayer::~AOBlipPlayer() void AOBlipPlayer::set_blips(QString p_sfx) { m_sfxplayer->stop(); - QString f_path = ao_app->get_sounds_path() + p_sfx.toLower(); + QString f_path = ao_app->get_sounds_path(p_sfx); m_sfxplayer->setSource(QUrl::fromLocalFile(f_path)); set_volume(m_volume); } diff --git a/aosfxplayer.cpp b/aosfxplayer.cpp index 03a3ac52..575e91f9 100644 --- a/aosfxplayer.cpp +++ b/aosfxplayer.cpp @@ -16,12 +16,12 @@ AOSfxPlayer::~AOSfxPlayer() void AOSfxPlayer::play(QString p_sfx, QString p_char) { m_sfxplayer->stop(); - p_sfx = p_sfx.toLower(); + p_sfx = p_sfx; QString f_path; if (p_char != "") f_path = ao_app->get_character_path(p_char, p_sfx); else - f_path = ao_app->get_sounds_path() + p_sfx; + f_path = ao_app->get_sounds_path(p_sfx); m_sfxplayer->setSource(QUrl::fromLocalFile(f_path)); set_volume(m_volume); diff --git a/path_functions.cpp b/path_functions.cpp index f066102d..4d7e246c 100644 --- a/path_functions.cpp +++ b/path_functions.cpp @@ -86,9 +86,9 @@ QString AOApplication::get_character_emotions_path(QString p_character, QString #endif } -QString AOApplication::get_sounds_path() +QString AOApplication::get_sounds_path(QString p_file) { - QString path = get_base_path() + "sounds/general/"; + QString path = get_base_path() + "sounds/general/" + p_file; #ifndef CASE_SENSITIVE_FILESYSTEM return path; #else diff --git a/text_file_functions.cpp b/text_file_functions.cpp index e31ff862..f63e720c 100644 --- a/text_file_functions.cpp +++ b/text_file_functions.cpp @@ -433,14 +433,14 @@ QString AOApplication::get_chat(QString p_char) QString f_result = read_char_ini(p_char, "chat", "[Options]", "[Time]"); //handling the correct order of chat is a bit complicated, we let the caller do it - return f_result.toLower(); + return f_result; } QString AOApplication::get_char_shouts(QString p_char) { QString f_result = read_char_ini(p_char, "shouts", "[Options]", "[Time]"); - return f_result.toLower(); + return f_result; } int AOApplication::get_preanim_duration(QString p_char, QString p_emote) |