Move KeyList & InputHandler from game.h to client/inputhandler.h (#5752)

[minetest.git] / src / mainmenumanager.h

diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h
index b14ca56e51c84f912d33a82603a2f000c375c8ae..fb715ca9b65e169237b7c0db585b04414f4a70e3 100644 (file)
--- a/src/mainmenumanager.h
+++ b/src/mainmenumanager.h
@@ -39,7 +39,7 @@ class IGameCallback
        virtual void signalKeyConfigChange() = 0;
 };
 
-extern gui::IGUIEnvironment* guienv;
+extern gui::IGUIEnvironment *guienv;
 extern gui::IGUIStaticText *guiroot;
 
 // Handler for the modal menus
@@ -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 @@ class MainMenuManager : public IMenuManager
                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 @@ class MainMenuManager : public IMenuManager
                /*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 @@ class MainMenuManager : public IMenuManager
        // 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,21 +104,22 @@ class MainMenuManager : public IMenuManager
 
        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
 {
@@ -167,7 +168,7 @@ class MainGameCallback : public IGameCallback
                keyconfig_changed = true;
        }
 
-       
+
        bool disconnect_requested;
        bool changepassword_requested;
        bool changevolume_requested;