From c81c6e5eb7a0e991039b7662868e87a8d2fe3415 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Wed, 17 Feb 2021 15:04:46 +0100 Subject: Add: draw the screen at a steady pace, also during fast-forward During fast-forward, the game was drawing as fast as it could. This means that the fast-forward was limited also by how fast we could draw, something that people in general don't expect. To give an extreme case, if you are fully zoomed out on a busy map, fast-forward would be mostly limited because of the time it takes to draw the screen. By decoupling the draw-tick and game-tick, we can keep the pace of the draw-tick the same while speeding up the game-tick. To use the extreme case as example again, if you are fully zoomed out now, the screen only redraws 33.33 times per second, fast-forwarding or not. This means fast-forward is much more likely to go at the same speed, no matter what you are looking at. --- src/video/allegro_v.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'src/video/allegro_v.cpp') diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp index 493e5a81d..7a51415c7 100644 --- a/src/video/allegro_v.cpp +++ b/src/video/allegro_v.cpp @@ -24,6 +24,7 @@ #include "../core/math_func.hpp" #include "../framerate_type.h" #include "../thread.h" +#include "../window_func.h" #include "allegro_v.h" #include @@ -449,7 +450,8 @@ void VideoDriver_Allegro::MainLoop() { auto cur_ticks = std::chrono::steady_clock::now(); auto last_realtime_tick = cur_ticks; - auto next_tick = cur_ticks; + auto next_game_tick = cur_ticks; + auto next_draw_tick = cur_ticks; CheckPaletteAnim(); @@ -481,8 +483,14 @@ void VideoDriver_Allegro::MainLoop() last_realtime_tick += delta; } - if (cur_ticks >= next_tick || (_fast_forward && !_pause_mode)) { - next_tick = cur_ticks + std::chrono::milliseconds(MILLISECONDS_PER_TICK); + if (cur_ticks >= next_game_tick || (_fast_forward && !_pause_mode)) { + next_game_tick = cur_ticks + std::chrono::milliseconds(MILLISECONDS_PER_TICK); + + GameLoop(); + } + + if (cur_ticks >= next_draw_tick) { + next_draw_tick = cur_ticks + std::chrono::milliseconds(MILLISECONDS_PER_TICK); bool old_ctrl_pressed = _ctrl_pressed; @@ -498,16 +506,15 @@ void VideoDriver_Allegro::MainLoop() if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged(); - GameLoop(); - + InputLoop(); UpdateWindows(); CheckPaletteAnim(); + DrawSurfaceToScreen(); - } else { + } + + if (!_fast_forward || _pause_mode) { CSleep(1); - NetworkDrawChatMessage(); - DrawMouseCursor(); - DrawSurfaceToScreen(); } } } -- cgit v1.2.3-54-g00ecf