diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoapplication.h | 7 | ||||
| -rw-r--r-- | include/aooptionsdialog.h | 2 | ||||
| -rw-r--r-- | include/aoscene.h | 1 | ||||
| -rw-r--r-- | include/courtroom.h | 13 |
4 files changed, 20 insertions, 3 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h index 5475eb7..4a3c669 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -144,12 +144,15 @@ public: //Returns the value of ooc_name in config.ini QString get_ooc_name(); - //Returns the blip rate from config.ini + //Returns the blip rate from config.ini (once per X symbols) int read_blip_rate(); //Returns true if blank blips is enabled in config.ini and false otherwise bool get_blank_blip(); + //Returns true if stop music on objection is enabled in the config.ini + bool objection_stop_music(); + //Returns the value of default_music in config.ini int get_default_music(); @@ -219,7 +222,7 @@ public: //Figure out if we can opus this or if we should fall back to wav QString get_sfx_suffix(QString sound_to_check); - // Can we use APNG for this? If not, fall back to a gif. + // Can we use APNG for this? If not, WEBP? If not, GIF? If not, fall back to PNG. QString get_image_suffix(QString path_to_check); //Returns the value of p_search_line within target_tag and terminator_tag diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h index 934d257..34ae2b7 100644 --- a/include/aooptionsdialog.h +++ b/include/aooptionsdialog.h @@ -88,6 +88,8 @@ private: QLabel *ui_bliprate_lbl; QCheckBox *ui_blank_blips_cb; QLabel *ui_blank_blips_lbl; + QLabel *ui_objectmusic_lbl; + QCheckBox *ui_objectmusic_cb; QDialogButtonBox *ui_settings_buttons; QWidget *ui_casing_tab; diff --git a/include/aoscene.h b/include/aoscene.h index b58c0fd..ddbefe0 100644 --- a/include/aoscene.h +++ b/include/aoscene.h @@ -21,6 +21,7 @@ private: QWidget *m_parent; QMovie *m_movie; AOApplication *ao_app; + QString last_image; }; diff --git a/include/courtroom.h b/include/courtroom.h index fe870b4..b330337 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -64,6 +64,8 @@ public: void append_evidence(evi_type p_evi){evidence_list.append(p_evi);} void append_music(QString f_music){music_list.append(f_music);} void append_area(QString f_area){area_list.append(f_area);} + void clear_music(){music_list.clear();} + void clear_areas(){area_list.clear();} void fix_last_area() { @@ -247,7 +249,7 @@ private: bool message_is_centered = false; int current_display_speed = 3; - int message_display_speed[7] = {30, 40, 50, 60, 75, 100, 120}; + int message_display_speed[7] = {10, 20, 30, 40, 50, 60, 75}; // This is for checking if the character should start talking again // when an inline blue text ends. @@ -309,6 +311,15 @@ private: //every time point in char.inis times this equals the final time const int time_mod = 40; + //the amount of time non-animated objection/hold it/takethat images stay onscreen for in ms + const int shout_stay_time = 724; + + //the amount of time non-animated guilty/not guilty images stay onscreen for in ms + const int verdict_stay_time = 3000; + + //the amount of time non-animated witness testimony/cross-examination images stay onscreen for in ms + const int wtce_stay_time = 1500; + static const int chatmessage_size = 23; QString m_chatmessage[chatmessage_size]; bool chatmessage_is_empty = false; |
