diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-11-10 14:07:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 14:07:45 -0600 |
| commit | 4eb45ef2b08095b9ecd81b62de1761ed5dac8b84 (patch) | |
| tree | f37f30a92bf883ea0e87cc5192d004626a1d23c1 /include | |
| parent | fe3b16829fc51e04e284436788db57e96bdded24 (diff) | |
| parent | c392bb3415ca8a01dbfc5129527af25ae6de9c08 (diff) | |
Merge pull request #305 from Crystalwarrior/bugfix/blip-accuracy
More accurate/consistent blip rate functionality + punctuation slowdown fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoblipplayer.h | 3 | ||||
| -rw-r--r-- | include/courtroom.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 4d3b5f1..a11e29d 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -22,12 +22,9 @@ public: int m_cycle = 0; private: - const int max_blip_ms = 60; - QWidget *m_parent; AOApplication *ao_app; qreal m_volume; - QElapsedTimer delay; void set_volume_internal(qreal p_volume); diff --git a/include/courtroom.h b/include/courtroom.h index df13c69..f05b15a 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -275,7 +275,7 @@ private: bool message_is_centered = false; int current_display_speed = 3; - int message_display_speed[7] = {0, 10, 25, 40, 50, 70, 90}; + int message_display_speed[7] = {5, 10, 25, 40, 50, 70, 90}; // The character ID of the character this user wants to appear alongside with. int other_charid = -1; @@ -314,7 +314,7 @@ private: int real_tick_pos = 0; // used to determine how often blips sound int blip_ticker = 0; - int blip_rate = 1; + int blip_rate = 2; int rainbow_counter = 0; bool rainbow_appended = false; bool blank_blip = false; |