aboutsummaryrefslogtreecommitdiff
path: root/include/courtroom.h
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-09-12 19:03:42 +0300
committerCrystalwarrior <varsash@gmail.com>2019-09-12 22:45:52 +0300
commit5a31516a36e0f13211db807a48214f11ccef827d (patch)
treee2b0976776ff9b89e492baa6b11e532bfbff0a33 /include/courtroom.h
parente76a83ddfe8f6fe16ee7e2a91d3ac30e89f80345 (diff)
Remove unecessary hard-coded timers for the witness testimony .png
Make the witness testimony use AOMovie instead of AOImage Remove pointless "testimony_in_progress" variable CONTROVERSIAL: Make the witness testimony indicator be position-ignorant so as to reduce the amount of hardcoding and allow broader usage of the witness testimony system (For example, Danganronpa investigation indicator, etc.) - This should not affect how the testimony indicator is received currently, as witness testimony usually requires the entire rest of the court to shut up until the cross-examination either way. (cherry picked from commit 932f430b683dffb0b965c32cd2247e2b6361dd0e)
Diffstat (limited to 'include/courtroom.h')
-rw-r--r--include/courtroom.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/include/courtroom.h b/include/courtroom.h
index f0b69967..e053e237 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -309,11 +309,6 @@ private:
//keeps track of how long realization is visible(it's just a white square and should be visible less than a second)
QTimer *realization_timer;
- //times how long the blinking testimony should be shown(green one in the corner)
- QTimer *testimony_show_timer;
- //times how long the blinking testimony should be hidden
- QTimer *testimony_hide_timer;
-
//every time point in char.inis times this equals the final time
const int time_mod = 40;
@@ -323,14 +318,6 @@ private:
QString previous_ic_message = "";
- bool testimony_in_progress = false;
-
- //in milliseconds
- const int testimony_show_time = 1500;
-
- //in milliseconds
- const int testimony_hide_time = 500;
-
//char id, muted or not
QMap<int, bool> mute_map;
@@ -407,8 +394,8 @@ private:
AOImage *ui_vp_chatbox;
QLabel *ui_vp_showname;
QTextEdit *ui_vp_message;
- AOImage *ui_vp_testimony;
AOImage *ui_vp_realization;
+ AOMovie *ui_vp_testimony;
AOMovie *ui_vp_wtce;
AOMovie *ui_vp_objection;