1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00

Revert "Get rid of global guienv variable"

This reverts commit 16da954bd7.
This commit is contained in:
Desour 2023-08-22 19:20:49 +02:00 committed by DS
parent f98726c516
commit 7e4dccb3b5
8 changed files with 37 additions and 29 deletions

View file

@ -49,6 +49,9 @@ class GameUI
friend class TestGameUI;
public:
GameUI();
~GameUI() = default;
// Flags that can, or may, change during main game loop
struct Flags
{
@ -60,7 +63,7 @@ public:
bool show_profiler_graph = false;
};
void init(gui::IGUIEnvironment *m_guienv);
void init();
void update(const RunStats &stats, Client *client, MapDrawControl *draw_control,
const CameraOrientation &cam, const PointedThing &pointed_old,
const GUIChatConsole *chat_console, float dtime);
@ -118,7 +121,7 @@ private:
gui::IGUIStaticText *m_guitext_status = nullptr;
std::wstring m_statustext;
float m_statustext_time = 0.0f;
video::SColor m_statustext_initial_color = video::SColor(255, 0, 0, 0);
video::SColor m_statustext_initial_color;
gui::IGUIStaticText *m_guitext_chat = nullptr; // Chat text
u32 m_recent_chat_count = 0;