Formspec: Add options to set background color and opacity (fullscreen mode + default...

[minetest.git] / src / mainmenumanager.h

diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h
index b14ca56e51c84f912d33a82603a2f000c375c8ae..ea9327813407e03dae232ebfaba72cb6793dd84e 100644 (file)
--- a/src/mainmenumanager.h
+++ b/src/mainmenumanager.h
@@ -17,14 +17,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAINMENUMANAGER_HEADER
-#define MAINMENUMANAGER_HEADER
+#pragma once
 
 /*
        All kinds of stuff that needs to be exposed from main.cpp
 */
-#include "debug.h" // assert
 #include "modalMenu.h"
+#include <cassert>
 #include <list>
 
 class IGameCallback
@@ -39,7 +38,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,27 +46,26 @@ 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
-                               i = m_stack.begin();
-                               i != m_stack.end(); ++i)
-               {
-                       assert(*i != menu);
+#ifndef NDEBUG
+               for (gui::IGUIElement *i : m_stack) {
+                       assert(i != menu);
                }
+#endif
 
                if(!m_stack.empty())
                        m_stack.back()->setVisible(false);
                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 +81,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 +89,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,42 +102,30 @@ class MainMenuManager : public IMenuManager
 
        bool pausesGame()
        {
-               for(std::list<GUIModalMenu*>::iterator
-                               i = m_stack.begin(); i != m_stack.end(); ++i)
-               {
-                       if((*i)->pausesGame())
+               for (gui::IGUIElement *i : m_stack) {
+                       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() = default;
+       virtual ~MainGameCallback() = default;
 
        virtual void exitToOS()
        {
                shutdown_requested = true;
-#ifndef __ANDROID__
-               device->closeDevice();
-#endif
        }
 
        virtual void disconnect()
@@ -167,19 +153,14 @@ class MainGameCallback : public IGameCallback
                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;
-
-#endif
-