aboutsummaryrefslogtreecommitdiff
path: root/src/courtroom.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-09-14 00:46:46 +0300
committerCrystalwarrior <varsash@gmail.com>2019-09-14 00:46:46 +0300
commit4645d9dd080964560477e48d99812bc494c1965b (patch)
tree7a0fb1318ada5b95ebac3fed37bba8e1d74c4a33 /src/courtroom.cpp
parent1139bf5cd0473817ba223ac8a9fe9d193575206a (diff)
Add a blip sound QElapsedTimer so blipsounds don't play more frequently than 60ms to preserve all of our ears.
Adjust the message display speeds to feel more accurate to AA, with }}} speed displaying text instantly for that section
Diffstat (limited to 'src/courtroom.cpp')
-rw-r--r--src/courtroom.cpp28
1 files changed, 11 insertions, 17 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 06f5aa06..1435b0d4 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2386,23 +2386,6 @@ void Courtroom::chat_tick()
QScrollBar *scroll = ui_vp_message->verticalScrollBar();
scroll->setValue(scroll->maximum());
- if(blank_blip)
- qDebug() << "blank_blip found true";
-
- if (f_character != ' ' || blank_blip)
- {
-
- if (blip_pos % blip_rate == 0 && !formatting_char)
- {
- blip_pos = 0;
- blip_player->blip_tick();
- }
-
- ++blip_pos;
- }
-
- tick_pos += f_char_length;
-
// Restart the timer, but according to the newly set speeds, if there were any.
// Keep the speed at bay.
if (current_display_speed < 0)
@@ -2415,6 +2398,17 @@ void Courtroom::chat_tick()
current_display_speed = 6;
}
+ if (!formatting_char && (f_character != ' ' || blank_blip))
+ {
+ if (blip_pos % blip_rate == 0)
+ {
+ blip_player->blip_tick();
+ }
+ ++blip_pos;
+ }
+
+ tick_pos += f_char_length;
+
// If we had a formatting char, we shouldn't wait so long again, as it won't appear!
if (formatting_char)
{