Modernize client code (#6250)

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

diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h
index 6f8aa91376ffcf8a350eea80f42b04f212bdc4c0..adc40f4ffa3cd00120e1daeb39ec13c7f81fe504 100644 (file)
--- a/src/mainmenumanager.h
+++ b/src/mainmenumanager.h
@@ -47,9 +47,9 @@ extern gui::IGUIStaticText *guiroot;
 class MainMenuManager : public IMenuManager
 {
 public:
-       virtual void createdMenu(GUIModalMenu *menu)
+       virtual void createdMenu(gui::IGUIElement *menu)
        {
-               for(std::list<GUIModalMenu*>::iterator
+               for(std::list<gui::IGUIElement*>::iterator
                                i = m_stack.begin();
                                i != m_stack.end(); ++i)
                {
@@ -61,13 +61,13 @@ public:
                m_stack.push_back(menu);
        }
 
-       virtual void deletingMenu(GUIModalMenu *menu)
+       virtual void deletingMenu(gui::IGUIElement *menu)
        {
                // Remove all entries if there are duplicates
                bool removed_entry;
                do{
                        removed_entry = false;
-                       for(std::list<GUIModalMenu*>::iterator
+                       for(std::list<gui::IGUIElement*>::iterator
                                        i = m_stack.begin();
                                        i != m_stack.end(); ++i)
                        {
@@ -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);
        }
@@ -91,10 +91,10 @@ public:
        // Returns true to prevent further processing
        virtual bool preprocessEvent(const SEvent& event)
        {
-               if(!m_stack.empty())
-                       return m_stack.back()->preprocessEvent(event);
-               else
+               if (m_stack.empty())
                        return false;
+               GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(m_stack.back());
+               return mm && mm->preprocessEvent(event);
        }
 
        u32 menuCount()
@@ -104,42 +104,32 @@ public:
 
        bool pausesGame()
        {
-               for(std::list<GUIModalMenu*>::iterator
+               for(std::list<gui::IGUIElement*>::iterator
                                i = m_stack.begin(); i != m_stack.end(); ++i)
                {
-                       if((*i)->pausesGame())
+                       GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(*i);
+                       if (mm && mm->pausesGame())
                                return true;
                }
                return false;
        }
 
-       std::list<GUIModalMenu*> m_stack;
+       std::list<gui::IGUIElement*> m_stack;
 };
 
 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()
@@ -167,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;