Mapnode: Replace rotateAlongYAxis with improved version

[dragonfireclient.git] / src / mainmenumanager.h

diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h
index 56ba4012908ef909f226ed82104ae6989ef8399a..6f8aa91376ffcf8a350eea80f42b04f212bdc4c0 100644 (file)
--- a/src/mainmenumanager.h
+++ b/src/mainmenumanager.h
@@ -35,9 +35,11 @@ class IGameCallback
        virtual void disconnect() = 0;
        virtual void changePassword() = 0;
        virtual void changeVolume() = 0;
+
+       virtual void signalKeyConfigChange() = 0;
 };
 
-extern gui::IGUIEnvironment* guienv;
+extern gui::IGUIEnvironment *guienv;
 extern gui::IGUIStaticText *guiroot;
 
 // Handler for the modal menus
@@ -54,7 +56,7 @@ class MainMenuManager : public IMenuManager
                        assert(*i != menu);
                }
 
-               if(m_stack.size() != 0)
+               if(!m_stack.empty())
                        m_stack.back()->setVisible(false);
                m_stack.push_back(menu);
        }
@@ -82,14 +84,14 @@ class MainMenuManager : public IMenuManager
                assert(*i == menu);
                m_stack.erase(i);*/
                
-               if(m_stack.size() != 0)
+               if(!m_stack.empty())
                        m_stack.back()->setVisible(true);
        }
 
        // Returns true to prevent further processing
        virtual bool preprocessEvent(const SEvent& event)
        {
-               if(m_stack.size() != 0)
+               if(!m_stack.empty())
                        return m_stack.back()->preprocessEvent(event);
                else
                        return false;
@@ -127,6 +129,7 @@ class MainGameCallback : public IGameCallback
                changevolume_requested(false),
                keyconfig_requested(false),
                shutdown_requested(false),
+               keyconfig_changed(false),
                device(a_device)
        {
        }
@@ -159,12 +162,20 @@ class MainGameCallback : public IGameCallback
                keyconfig_requested = true;
        }
 
+       virtual void signalKeyConfigChange()
+       {
+               keyconfig_changed = true;
+       }
+
        
        bool disconnect_requested;
        bool changepassword_requested;
        bool changevolume_requested;
        bool keyconfig_requested;
        bool shutdown_requested;
+
+       bool keyconfig_changed;
+
        IrrlichtDevice *device;
 };