From aab3b18e4b9f847ba1e521d5a73624b0bb6a467a Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Thu, 4 Jan 2018 19:52:40 +0100 Subject: GameUI refactor (part 3/X): Move Game::guitext2, Game::guitext_info, Game::infotext to GameUI class Other enhancements: * Drop unused GameRunData::time_of_day * Little GameUI::update code path optimizations --- src/client/gameui.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/client/gameui.h') diff --git a/src/client/gameui.h b/src/client/gameui.h index 593fd4ff3..0e1085b01 100644 --- a/src/client/gameui.h +++ b/src/client/gameui.h @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once #include +#include #include "game.h" using namespace irr; @@ -49,20 +50,25 @@ public: }; void init(); - void update(const RunStats &stats, Client *client, const MapDrawControl *draw_control); + void update(const RunStats &stats, Client *client, MapDrawControl *draw_control, + const CameraOrientation &cam, const PointedThing &pointed_old); void initFlags(); const Flags &getFlags() const { return m_flags; } void showMinimap(bool show); + void setInfoText(const std::wstring &str) { m_infotext = str; } + void clearInfoText() { m_infotext.clear(); } + private: Flags m_flags; gui::IGUIStaticText *m_guitext; // First line of debug text + gui::IGUIStaticText *m_guitext2; // Second line of debug text + gui::IGUIStaticText *m_guitext_info; // At the middle of the screen + std::wstring m_infotext; // @TODO future move - // gui::IGUIStaticText *m_guitext2; // Second line of debug text - // gui::IGUIStaticText *m_guitext_info; // At the middle of the screen // gui::IGUIStaticText *m_guitext_status; // gui::IGUIStaticText *m_guitext_chat; // Chat text // gui::IGUIStaticText *m_guitext_profiler; // Profiler text -- cgit v1.2.3