From 9146c6a50fdf81196bab3d517b8313fb4fa3bc71 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 5 Jan 2018 19:39:06 +0100 Subject: Don't recalculate statustext initial color everytime & review fixes --- src/game.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index 924ca8c47..1ab360d3c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1277,7 +1277,7 @@ private: void updateChat(f32 dtime, const v2u32 &screensize); static const ClientEventHandler clientEventHandler[CLIENTEVENT_MAX]; - InputHandler *input; + InputHandler *input = nullptr; Client *client = nullptr; Server *server = nullptr; @@ -2669,9 +2669,9 @@ void Game::toggleFog() { m_flags.force_fog_off = !m_flags.force_fog_off; if (m_flags.force_fog_off) - m_game_ui->showTranslatedStatusText("Fog disabled"); + m_game_ui->showTranslatedStatusText("Fog disabled"); else - m_game_ui->showTranslatedStatusText("Fog enabled"); + m_game_ui->showTranslatedStatusText("Fog enabled"); } @@ -2912,9 +2912,8 @@ inline void Game::step(f32 *dtime) if (can_be_and_is_paused) { // This is for a singleplayer server *dtime = 0; // No time passes } else { - if (server) { + if (server) server->step(*dtime); - } client->step(*dtime); } -- cgit v1.2.3