Merge pull request #10 from corarona/master

[dragonfireclient.git] / src / gui / mainmenumanager.h

diff --git a/src/gui/mainmenumanager.h b/src/gui/mainmenumanager.h
index e2107ab6447d676f57fa393e846b09818d1ddbc0..102492255b78860f2baf11db7ea6ad5ed783b68d 100644 (file)
--- a/src/gui/mainmenumanager.h
+++ b/src/gui/mainmenumanager.h
@@ -54,7 +54,7 @@ class MainMenuManager : public IMenuManager
                }
 #endif
 
-               if (!m_stack.empty())
+               if(!m_stack.empty())
                        m_stack.back()->setVisible(false);
                m_stack.push_back(menu);
        }
@@ -68,32 +68,35 @@ class MainMenuManager : public IMenuManager
                assert(*i == menu);
                m_stack.erase(i);*/
 
-               if (!m_stack.empty())
+               if(!m_stack.empty())
                        m_stack.back()->setVisible(true);
        }
 
        // Returns true to prevent further processing
-       virtual bool preprocessEvent(const SEvent &event)
+       virtual bool preprocessEvent(const SEvent& event)
        {
                if (m_stack.empty())
                        return false;
-               GUIModalMenu *mm = dynamic_cast<GUIModalMenu *>(m_stack.back());
+               GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(m_stack.back());
                return mm && mm->preprocessEvent(event);
        }
 
-       u32 menuCount() { return m_stack.size(); }
+       u32 menuCount()
+       {
+               return m_stack.size();
+       }
 
        bool pausesGame()
        {
                for (gui::IGUIElement *i : m_stack) {
-                       GUIModalMenu *mm = dynamic_cast<GUIModalMenu *>(i);
+                       GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(i);
                        if (mm && mm->pausesGame())
                                return true;
                }
                return false;
        }
 
-       std::list<gui::IGUIElement *> m_stack;
+       std::list<gui::IGUIElement*> m_stack;
 };
 
 extern MainMenuManager g_menumgr;
@@ -106,17 +109,36 @@ class MainGameCallback : public IGameCallback
        MainGameCallback() = default;
        virtual ~MainGameCallback() = default;
 
-       virtual void exitToOS() { shutdown_requested = true; }
+       virtual void exitToOS()
+       {
+               shutdown_requested = true;
+       }
 
-       virtual void disconnect() { disconnect_requested = true; }
+       virtual void disconnect()
+       {
+               disconnect_requested = true;
+       }
 
-       virtual void changePassword() { changepassword_requested = true; }
+       virtual void changePassword()
+       {
+               changepassword_requested = true;
+       }
 
-       virtual void changeVolume() { changevolume_requested = true; }
+       virtual void changeVolume()
+       {
+               changevolume_requested = true;
+       }
 
-       virtual void keyConfig() { keyconfig_requested = true; }
+       virtual void keyConfig()
+       {
+               keyconfig_requested = true;
+       }
+
+       virtual void signalKeyConfigChange()
+       {
+               keyconfig_changed = true;
+       }
 
-       virtual void signalKeyConfigChange() { keyconfig_changed = true; }
 
        bool disconnect_requested = false;
        bool changepassword_requested = false;