diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-09-13 11:41:59 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-09-13 11:41:59 +0300 |
| commit | bb8edab5798be59476557c0eae2b6aa1f4257448 (patch) | |
| tree | 5f60d7e39dc4765920643d911d685dba6c8b4d1e /src/courtroom.cpp | |
| parent | 8027bbffadc63b269091567f2557b8cd81abee56 (diff) | |
Make shout, verdict and wtce default duration values into constants
Diffstat (limited to 'src/courtroom.cpp')
| -rw-r--r-- | src/courtroom.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 0faab3e9..b1fd1c2e 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1330,22 +1330,22 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) switch (objection_mod) { case 1: - ui_vp_objection->play("holdit", f_char, f_custom_theme, 724); + ui_vp_objection->play("holdit", f_char, f_custom_theme, shout_stay_time); objection_player->play("holdit.wav", f_char, f_custom_theme); break; case 2: - ui_vp_objection->play("objection", f_char, f_custom_theme, 724); + ui_vp_objection->play("objection", f_char, f_custom_theme, shout_stay_time); objection_player->play("objection.wav", f_char, f_custom_theme); if (ao_app->objection_stop_music()) music_player->play(""); //I'd prefer if this sent a networked message instead so everyone would have their music cut when you object. break; case 3: - ui_vp_objection->play("takethat", f_char, f_custom_theme, 724); + ui_vp_objection->play("takethat", f_char, f_custom_theme, shout_stay_time); objection_player->play("takethat.wav", f_char, f_custom_theme); break; //case 4 is AO2 only case 4: - ui_vp_objection->play("custom", f_char, f_custom_theme, 724); + ui_vp_objection->play("custom", f_char, f_custom_theme, shout_stay_time); objection_player->play("custom.wav", f_char, f_custom_theme); break; default: @@ -2524,14 +2524,14 @@ void Courtroom::handle_wtce(QString p_wtce, int variant) if (p_wtce == "testimony1") { sfx_player->play(ao_app->get_sfx("witness_testimony")); - ui_vp_wtce->play("witnesstestimony", "", "", 1500); + ui_vp_wtce->play("witnesstestimony", "", "", wtce_stay_time); ui_vp_testimony->play("testimony"); } //cross examination else if (p_wtce == "testimony2") { sfx_player->play(ao_app->get_sfx("cross_examination")); - ui_vp_wtce->play("crossexamination", "", "", 1500); + ui_vp_wtce->play("crossexamination", "", "", wtce_stay_time); ui_vp_testimony->stop(); } else if (p_wtce == "judgeruling") @@ -2539,12 +2539,12 @@ void Courtroom::handle_wtce(QString p_wtce, int variant) if (variant == 0) { sfx_player->play(ao_app->get_sfx("not_guilty")); - ui_vp_wtce->play("notguilty", "", "", 3000); + ui_vp_wtce->play("notguilty", "", "", verdict_stay_time); ui_vp_testimony->stop(); } else if (variant == 1) { sfx_player->play(ao_app->get_sfx("guilty")); - ui_vp_wtce->play("guilty", "", "", 3000); + ui_vp_wtce->play("guilty", "", "", verdict_stay_time); ui_vp_testimony->stop(); } } |