mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix 91b8ce07: dedicated servers could no longer create screenshots (#9232) 

Although most commands are not useful on a dedicated server,
screenshot commands should be dequeued.
This commit is contained in:
Patric Stout 2021-05-12 16:31:31 +02:00 committed by GitHub
parent 3d9436bd75
commit 56050fc96f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video/dedicated_v.cpp
View File

@ -270,6 +270,7 @@ void VideoDriver_Dedicated::MainLoop()
while (!_exit_game) {
if (!_dedicated_forks) DedicatedHandleKeyInput();
this->DrainCommandQueue();
ChangeGameSpeed(_ddc_fastforward);
this->Tick();

34
src/video/video_driver.hpp
View File

@ -319,23 +319,6 @@ protected:
return std::chrono::microseconds(1000000 / _settings_client.gui.refresh_rate);
}
std::chrono::steady_clock::time_point next_game_tick;
std::chrono::steady_clock::time_point next_draw_tick;
bool fast_forward_key_pressed; ///< The fast-forward key is being pressed.
bool fast_forward_via_key; ///< The fast-forward was enabled by key press.
bool is_game_threaded;
std::thread game_thread;
std::mutex game_state_mutex;
std::mutex game_thread_wait_mutex;
static void GameThreadThunk(VideoDriver *drv);
private:
std::mutex cmd_queue_mutex;
std::vector<std::function<void()>> cmd_queue;
/** Execute all queued commands. */
void DrainCommandQueue()
{
@ -354,6 +337,23 @@ private:
}
}
std::chrono::steady_clock::time_point next_game_tick;
std::chrono::steady_clock::time_point next_draw_tick;
bool fast_forward_key_pressed; ///< The fast-forward key is being pressed.
bool fast_forward_via_key; ///< The fast-forward was enabled by key press.
bool is_game_threaded;
std::thread game_thread;
std::mutex game_state_mutex;
std::mutex game_thread_wait_mutex;
static void GameThreadThunk(VideoDriver *drv);
private:
std::mutex cmd_queue_mutex;
std::vector<std::function<void()>> cmd_queue;
void GameLoop();
void GameThread();
};