Modernize client code (#6250)

[oweals/minetest.git] / src / mainmenumanager.h

diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h
index 17133b1642253a8a022c4e095f9e72a45be09bb9..adc40f4ffa3cd00120e1daeb39ec13c7f81fe504 100644 (file)
--- a/src/mainmenumanager.h
+++ b/src/mainmenumanager.h
@@ -83,7 +83,7 @@ public:
                /*core::list<GUIModalMenu*>::Iterator i = m_stack.getLast();
                assert(*i == menu);
                m_stack.erase(i);*/
-               
+
                if(!m_stack.empty())
                        m_stack.back()->setVisible(true);
        }
@@ -119,28 +119,17 @@ public:
 
 extern MainMenuManager g_menumgr;
 
-extern bool noMenuActive();
+extern bool isMenuActive();
 
 class MainGameCallback : public IGameCallback
 {
 public:
-       MainGameCallback(IrrlichtDevice *a_device):
-               disconnect_requested(false),
-               changepassword_requested(false),
-               changevolume_requested(false),
-               keyconfig_requested(false),
-               shutdown_requested(false),
-               keyconfig_changed(false),
-               device(a_device)
-       {
-       }
+       MainGameCallback() {}
+       virtual ~MainGameCallback() {}
 
        virtual void exitToOS()
        {
                shutdown_requested = true;
-#ifndef __ANDROID__
-               device->closeDevice();
-#endif
        }
 
        virtual void disconnect()
@@ -168,16 +157,14 @@ public:
                keyconfig_changed = true;
        }
 
-       
-       bool disconnect_requested;
-       bool changepassword_requested;
-       bool changevolume_requested;
-       bool keyconfig_requested;
-       bool shutdown_requested;
 
-       bool keyconfig_changed;
+       bool disconnect_requested = false;
+       bool changepassword_requested = false;
+       bool changevolume_requested = false;
+       bool keyconfig_requested = false;
+       bool shutdown_requested = false;
 
-       IrrlichtDevice *device;
+       bool keyconfig_changed = false;
 };
 
 extern MainGameCallback *g_gamecallback;