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

Fixes Objections hiding the current character, instead of overlaying on top of it. Adds screenshake to objects.

Browse Source
This commit is contained in:
iamgoofball 2019-03-23 14:33:31 -07:00
parent 0dcf8a7f17
commit e6cb5bd2cf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/courtroom.cpp
View File

@ -1517,7 +1517,6 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
text_state = 0; text_state = 0;
anim_state = 0; anim_state = 0;
ui_vp_objection->stop(); ui_vp_objection->stop();
ui_vp_player_char->stop();
chat_tick_timer->stop(); chat_tick_timer->stop();
ui_vp_evidence_display->reset(); ui_vp_evidence_display->reset();
@ -1564,16 +1563,19 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
case 1: case 1:
ui_vp_objection->play("holdit", f_char, f_custom_theme); ui_vp_objection->play("holdit", f_char, f_custom_theme);
objection_player->play("holdit.wav", f_char, f_custom_theme); objection_player->play("holdit.wav", f_char, f_custom_theme);
this->doScreenShake();
break; break;
case 2: case 2:
ui_vp_objection->play("objection", f_char, f_custom_theme); ui_vp_objection->play("objection", f_char, f_custom_theme);
objection_player->play("objection.wav", f_char, f_custom_theme); objection_player->play("objection.wav", f_char, f_custom_theme);
this->doScreenShake();
if(ao_app->get_objectmusic()) if(ao_app->get_objectmusic())
music_player->kill_loop(); music_player->kill_loop();
break; break;
case 3: case 3:
ui_vp_objection->play("takethat", f_char, f_custom_theme); ui_vp_objection->play("takethat", f_char, f_custom_theme);
objection_player->play("takethat.wav", f_char, f_custom_theme); objection_player->play("takethat.wav", f_char, f_custom_theme);
this->doScreenShake();
break; break;
//case 4 is AO2 only //case 4 is AO2 only
case 4: case 4: