From 5ee92bc1ee32b53a72d67334f7b714d8aa1f9454 Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Sun, 2 Jun 2024 00:13:18 -0400 Subject: [PATCH] backport "Few minor C++ fixes" not at all * backport https://github.com/MultiCraft/MultiCraft/commit/344ef13bc061598c466705b0e1b443b5a4d61c8b * we are using irrlilch 1.8 so https://irrlicht.sourceforge.io/docu/classirr_1_1video_1_1_i_video_driver.html#a8c02ee280bb738cdf38b77e7a798244e * do not remove the IrrlichtDevice due backguard compatibilty --- src/client/guiscalingfilter.cpp | 2 +- src/terminal_chat_console.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/guiscalingfilter.cpp b/src/client/guiscalingfilter.cpp index dd65d1bea..b733b76c9 100644 --- a/src/client/guiscalingfilter.cpp +++ b/src/client/guiscalingfilter.cpp @@ -129,7 +129,7 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver, #endif // Convert the scaled image back into a texture. - scaled = driver->addTexture(scalename, destimg, NULL); + scaled = driver->addTexture(scalename, destimg, NULL); // irr 1.8 destimg->drop(); g_txrCache[scalename] = scaled; diff --git a/src/terminal_chat_console.cpp b/src/terminal_chat_console.cpp index 80667592e..eac0044af 100644 --- a/src/terminal_chat_console.cpp +++ b/src/terminal_chat_console.cpp @@ -398,7 +398,7 @@ void TerminalChatConsole::step(int ch) minutes = (float)minutes / 1000 * 60; if (m_game_time) - printw(" | Game %d Time of day %02d:%02d ", + printw(" | Game %ld Time of day %02d:%02d ", m_game_time, hours, minutes); // draw text