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

Fix a bug where user would be unable to speak if the BG changed when someone else was speaking

Browse Source 
Make it so blip sounds are accessed in base/sounds/blips/* if such a path exists
This commit is contained in:
Crystalwarrior 2019-11-18 20:27:37 +03:00
parent 886ec26e20
commit 34848c4eaf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/courtroom.cpp
View File

@ -1028,7 +1028,14 @@ void Courtroom::set_background(QString p_background, bool display)
ui_vp_message->hide(); ui_vp_message->hide();
ui_vp_chatbox->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(); chat_tick_timer->stop();
ui_vp_evidence_display->reset();
set_scene(QString::number(ao_app->get_desk_mod(current_char, current_emote)), current_side); set_scene(QString::number(ao_app->get_desk_mod(current_char, current_emote)), current_side);
} }
} }

4
src/text_file_functions.cpp
View File

@ -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(f_result))))
{ {
if (file_exists(get_sfx_suffix(get_sounds_path("blips/" + f_result)))) if (file_exists(get_sfx_suffix(get_sounds_path("../blips/" + f_result))))
return "blips/" + f_result; //Return the cool kids variant return "../blips/" + f_result; //Return the cool kids variant
return "sfx-blip" + f_result; //Return legacy variant return "sfx-blip" + f_result; //Return legacy variant
} }