Fix revoke debug privs not reliably turn off stuff (#11409)

[dragonfireclient.git] / src / gui / guiEngine.cpp

diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
index 93463ad709df7294361663fb225879e1380f86fa..694baf482f24c64c757b265ba6cea70d502323ec 100644 (file)
--- a/src/gui/guiEngine.cpp
+++ b/src/gui/guiEngine.cpp
@@ -121,12 +121,14 @@ void MenuMusicFetcher::fetchSounds(const std::string &name,
 /******************************************************************************/
 GUIEngine::GUIEngine(JoystickController *joystick,
                gui::IGUIElement *parent,
+               RenderingEngine *rendering_engine,
                IMenuManager *menumgr,
                MainMenuData *data,
                bool &kill) :
+       m_rendering_engine(rendering_engine),
        m_parent(parent),
        m_menumanager(menumgr),
-       m_smgr(RenderingEngine::get_scene_manager()),
+       m_smgr(rendering_engine->get_scene_manager()),
        m_data(data),
        m_kill(kill)
 {
@@ -138,7 +140,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
        m_buttonhandler = new TextDestGuiEngine(this);
 
        //create texture source
-       m_texture_source = new MenuTextureSource(RenderingEngine::get_video_driver());
+       m_texture_source = new MenuTextureSource(rendering_engine->get_video_driver());
 
        //create soundmanager
        MenuMusicFetcher soundfetcher;
@@ -156,7 +158,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
                g_fontengine->getTextHeight());
        rect += v2s32(4, 0);
 
-       m_irr_toplefttext = gui::StaticText::add(RenderingEngine::get_gui_env(),
+       m_irr_toplefttext = gui::StaticText::add(rendering_engine->get_gui_env(),
                        m_toplefttext, rect, false, true, 0, -1);
 
        //create formspecsource
@@ -168,6 +170,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
                        -1,
                        m_menumanager,
                        NULL /* &client */,
+                       m_rendering_engine->get_gui_env(),
                        m_texture_source,
                        m_sound_manager,
                        m_formspecgui,
@@ -232,7 +235,7 @@ void GUIEngine::run()
 {
        // Always create clouds because they may or may not be
        // needed based on the game selected
-       video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+       video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
 
        cloudInit();
 
@@ -259,10 +262,10 @@ void GUIEngine::run()
                                fog_pixelfog, fog_rangefog);
        }
 
-       while (RenderingEngine::run() && (!m_startgame) && (!m_kill)) {
+       while (m_rendering_engine->run() && (!m_startgame) && (!m_kill)) {
 
                const irr::core::dimension2d<u32> &current_screen_size =
-                       RenderingEngine::get_video_driver()->getScreenSize();
+                       m_rendering_engine->get_video_driver()->getScreenSize();
                // Verify if window size has changed and save it if it's the case
                // Ensure evaluating settings->getBool after verifying screensize
                // First condition is cheaper
@@ -293,11 +296,11 @@ void GUIEngine::run()
                drawHeader(driver);
                drawFooter(driver);
 
-               RenderingEngine::get_gui_env()->drawAll();
+               m_rendering_engine->get_gui_env()->drawAll();
 
                driver->endScene();
 
-               IrrlichtDevice *device = RenderingEngine::get_raw_device();
+               IrrlichtDevice *device = m_rendering_engine->get_raw_device();
                u32 frametime_min = 1000 / (device->isWindowFocused()
                        ? g_settings->getFloat("fps_max")
                        : g_settings->getFloat("fps_max_unfocused"));
@@ -330,7 +333,7 @@ GUIEngine::~GUIEngine()
        //clean up texture pointers
        for (image_definition &texture : m_textures) {
                if (texture.texture)
-                       RenderingEngine::get_video_driver()->removeTexture(texture.texture);
+                       m_rendering_engine->get_video_driver()->removeTexture(texture.texture);
        }
 
        delete m_texture_source;
@@ -350,13 +353,13 @@ void GUIEngine::cloudInit()
                                v3f(0,0,0), v3f(0, 60, 100));
        m_cloud.camera->setFarValue(10000);
 
-       m_cloud.lasttime = RenderingEngine::get_timer_time();
+       m_cloud.lasttime = m_rendering_engine->get_timer_time();
 }
 
 /******************************************************************************/
 void GUIEngine::cloudPreProcess()
 {
-       u32 time = RenderingEngine::get_timer_time();
+       u32 time = m_rendering_engine->get_timer_time();
 
        if(time > m_cloud.lasttime)
                m_cloud.dtime = (time - m_cloud.lasttime) / 1000.0;
@@ -377,7 +380,7 @@ void GUIEngine::cloudPostProcess(u32 frametime_min, IrrlichtDevice *device)
        u32 busytime_u32;
 
        // not using getRealTime is necessary for wine
-       u32 time = RenderingEngine::get_timer_time();
+       u32 time = m_rendering_engine->get_timer_time();
        if(time > m_cloud.lasttime)
                busytime_u32 = time - m_cloud.lasttime;
        else
@@ -528,7 +531,7 @@ void GUIEngine::drawFooter(video::IVideoDriver *driver)
 bool GUIEngine::setTexture(texture_layer layer, const std::string &texturepath,
                bool tile_image, unsigned int minsize)
 {
-       video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+       video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
 
        if (m_textures[layer].texture) {
                driver->removeTexture(m_textures[layer].texture);
@@ -595,7 +598,7 @@ void GUIEngine::updateTopLeftTextSize()
        rect += v2s32(4, 0);
 
        m_irr_toplefttext->remove();
-       m_irr_toplefttext = gui::StaticText::add(RenderingEngine::get_gui_env(),
+       m_irr_toplefttext = gui::StaticText::add(m_rendering_engine->get_gui_env(),
                        m_toplefttext, rect, false, true, 0, -1);
 }