diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-09-12 19:37:44 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-09-12 22:46:06 +0300 |
| commit | 3b3507df60673079482372b4da08eeabf9317a20 (patch) | |
| tree | 5761ede5975db859c3a5a9215ba85a50a5b7562f /include | |
| parent | 5a31516a36e0f13211db807a48214f11ccef827d (diff) | |
Fix compilation error
Allow realization flashes to be animated images by making them AOMovies
Eploit the newly added 'duration' system for realization AOMovie
(cherry picked from commit bb98f79083648243216f665852a7d2326af11be0)
Diffstat (limited to 'include')
| -rw-r--r-- | include/courtroom.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/courtroom.h b/include/courtroom.h index e053e237..fe870b46 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -306,9 +306,6 @@ private: //delay before sfx plays QTimer *sfx_delay_timer; - //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; - //every time point in char.inis times this equals the final time const int time_mod = 40; @@ -394,7 +391,7 @@ private: AOImage *ui_vp_chatbox; QLabel *ui_vp_showname; QTextEdit *ui_vp_message; - AOImage *ui_vp_realization; + AOMovie *ui_vp_realization; AOMovie *ui_vp_testimony; AOMovie *ui_vp_wtce; AOMovie *ui_vp_objection; @@ -538,11 +535,6 @@ public slots: void objection_done(); void preanim_done(); - void realization_done(); - - void show_testimony(); - void hide_testimony(); - void mod_called(QString p_ip); void case_called(QString msg, bool def, bool pro, bool jud, bool jur, bool steno); |
