diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-11-18 20:27:37 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-11-18 20:27:37 +0300 |
| commit | 34848c4eaf8df62719045889a55be4c9ac2419a8 (patch) | |
| tree | 937f1fb0f8a68b335eddfdcbd3c8baf29fb5cca2 | |
| parent | 886ec26e2095bdcb18a05b57cb7c302be0d906c6 (diff) | |
Fix a bug where user would be unable to speak if the BG changed when someone else was speaking
Make it so blip sounds are accessed in base/sounds/blips/* if such a path exists
| -rw-r--r-- | src/courtroom.cpp | 7 | ||||
| -rw-r--r-- | src/text_file_functions.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index db48e512..1a1fd9ed 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1028,7 +1028,14 @@ void Courtroom::set_background(QString p_background, bool display) ui_vp_message->hide(); ui_vp_chatbox->hide(); + //Stop the chat arrow from animating + ui_vp_chat_arrow->stop(); + + text_state = 0; + anim_state = 0; + ui_vp_objection->stop(); chat_tick_timer->stop(); + ui_vp_evidence_display->reset(); set_scene(QString::number(ao_app->get_desk_mod(current_char, current_emote)), current_side); } } diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 41b20f3a..783c83b9 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -634,8 +634,8 @@ QString AOApplication::get_gender(QString p_char) if (!file_exists(get_sfx_suffix(get_sounds_path(f_result)))) { - if (file_exists(get_sfx_suffix(get_sounds_path("blips/" + f_result)))) - return "blips/" + f_result; //Return the cool kids variant + if (file_exists(get_sfx_suffix(get_sounds_path("../blips/" + f_result)))) + return "../blips/" + f_result; //Return the cool kids variant return "sfx-blip" + f_result; //Return legacy variant } |