Send long announce as POST, show OS in useragent

[dragonfireclient.git] / src / mainmenumanager.h

diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h
index ce7684f1156bc034581342b2bccad874bf93f820..ecfb89fd3111091184eaedaf2b97fde710a8c7a2 100644 (file)
--- a/src/mainmenumanager.h
+++ b/src/mainmenumanager.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h" // assert
 #include "modalMenu.h"
 #include "guiPauseMenu.h" //For IGameCallback
+#include <list>
 
 extern gui::IGUIEnvironment* guienv;
 extern gui::IGUIStaticText *guiroot;
@@ -37,15 +38,15 @@ class MainMenuManager : public IMenuManager
 public:
        virtual void createdMenu(GUIModalMenu *menu)
        {
-               for(core::list<GUIModalMenu*>::Iterator
+               for(std::list<GUIModalMenu*>::iterator
                                i = m_stack.begin();
-                               i != m_stack.end(); i++)
+                               i != m_stack.end(); ++i)
                {
                        assert(*i != menu);
                }
 
                if(m_stack.size() != 0)
-                       (*m_stack.getLast())->setVisible(false);
+                       m_stack.back()->setVisible(false);
                m_stack.push_back(menu);
        }
 
@@ -55,9 +56,9 @@ class MainMenuManager : public IMenuManager
                bool removed_entry;
                do{
                        removed_entry = false;
-                       for(core::list<GUIModalMenu*>::Iterator
+                       for(std::list<GUIModalMenu*>::iterator
                                        i = m_stack.begin();
-                                       i != m_stack.end(); i++)
+                                       i != m_stack.end(); ++i)
                        {
                                if(*i == menu)
                                {
@@ -73,7 +74,16 @@ class MainMenuManager : public IMenuManager
                m_stack.erase(i);*/
                
                if(m_stack.size() != 0)
-                       (*m_stack.getLast())->setVisible(true);
+                       m_stack.back()->setVisible(true);
+       }
+
+       // Returns true to prevent further processing
+       virtual bool preprocessEvent(const SEvent& event)
+       {
+               if(m_stack.size() != 0)
+                       return m_stack.back()->preprocessEvent(event);
+               else
+                       return false;
        }
 
        u32 menuCount()
@@ -81,7 +91,18 @@ class MainMenuManager : public IMenuManager
                return m_stack.size();
        }
 
-       core::list<GUIModalMenu*> m_stack;
+       bool pausesGame()
+       {
+               for(std::list<GUIModalMenu*>::iterator
+                               i = m_stack.begin(); i != m_stack.end(); ++i)
+               {
+                       if((*i)->pausesGame())
+                               return true;
+               }
+               return false;
+       }
+
+       std::list<GUIModalMenu*> m_stack;
 };
 
 extern MainMenuManager g_menumgr;