diff options
| author | iamgoofball <iamgoofball@gmail.com> | 2019-03-23 14:33:31 -0700 |
|---|---|---|
| committer | iamgoofball <iamgoofball@gmail.com> | 2019-03-23 14:33:31 -0700 |
| commit | e6cb5bd2cf241d638941ad5b403ab5fd7490335c (patch) | |
| tree | f0bfabbe3647734dec864dca66830c13e1694a6a /src | |
| parent | 0dcf8a7f179069dabae8aa61ba69675ad5182d76 (diff) | |
Fixes Objections hiding the current character, instead of overlaying on top of it. Adds screenshake to objects.
Diffstat (limited to 'src')
| -rw-r--r-- | src/courtroom.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index a082e6b8..636df5ab 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1517,7 +1517,6 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) text_state = 0; anim_state = 0; ui_vp_objection->stop(); - ui_vp_player_char->stop(); chat_tick_timer->stop(); ui_vp_evidence_display->reset(); @@ -1564,16 +1563,19 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) case 1: ui_vp_objection->play("holdit", f_char, f_custom_theme); objection_player->play("holdit.wav", f_char, f_custom_theme); + this->doScreenShake(); break; case 2: ui_vp_objection->play("objection", f_char, f_custom_theme); objection_player->play("objection.wav", f_char, f_custom_theme); + this->doScreenShake(); if(ao_app->get_objectmusic()) music_player->kill_loop(); break; case 3: ui_vp_objection->play("takethat", f_char, f_custom_theme); objection_player->play("takethat.wav", f_char, f_custom_theme); + this->doScreenShake(); break; //case 4 is AO2 only case 4: |