luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-12-18 04:55:20 +01:00
Code Activity

Revert "Get rid of guiroot"

Browse Source 
This reverts commit 45e7a80057.
This commit is contained in:
Desour
2023-08-22 19:21:02 +02:00
committed by DS
parent 7e4dccb3b5
commit f47b00426a
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/guiFormSpecMenu.cpp
View File

@@ -139,9 +139,9 @@ void GUIFormSpecMenu::create(GUIFormSpecMenu *&cur_formspec, Client *client,
TextDest *txt_dest, const std::string &formspecPrepend, ISoundManager *sound_manager)
{
if (cur_formspec == nullptr) {
cur_formspec = new GUIFormSpecMenu(joystick, guienv->getRootGUIElement(),
-1, &g_menumgr, client, guienv, client->getTextureSource(), sound_manager,
fs_src, txt_dest, formspecPrepend);
cur_formspec = new GUIFormSpecMenu(joystick, guiroot, -1, &g_menumgr,
client, guienv, client->getTextureSource(), sound_manager, fs_src,
txt_dest, formspecPrepend);
cur_formspec->doPause = false;
/*

2
src/gui/mainmenumanager.h
View File

@@ -38,8 +38,8 @@ public:
virtual void signalKeyConfigChange() = 0;
};
// FIXME: do we really need this global variable?
extern gui::IGUIEnvironment *guienv;
extern gui::IGUIStaticText *guiroot;
// Handler for the modal menus