Add minetest.register_lbm() to run code on block load only

[minetest.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 596945e9905e93806910a81cf2e8a808fbdc9500..e1f4e9346a77df11abf2a4f14afe244e0046084b 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,42 +20,52 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GAME_HEADER
 #define GAME_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <string>
 #include "keycode.h"
+#include <list>
 
-class KeyList : protected core::list<KeyPress>
+class KeyList : protected std::list<KeyPress>
 {
-       typedef core::list<KeyPress> super;
-       typedef super::Iterator Iterator;
-       typedef super::ConstIterator ConstIterator;
+       typedef std::list<KeyPress> super;
+       typedef super::iterator iterator;
+       typedef super::const_iterator const_iterator;
 
-       virtual ConstIterator find(const KeyPress &key) const
+       virtual const_iterator find(const KeyPress &key) const
        {
-               ConstIterator f(begin());
-               ConstIterator e(end());
-               while (f!=e) {
+               const_iterator f(begin());
+               const_iterator e(end());
+
+               while (f != e) {
                        if (*f == key)
                                return f;
+
                        ++f;
                }
+
                return e;
        }
 
-       virtual Iterator find(const KeyPress &key)
+       virtual iterator find(const KeyPress &key)
        {
-               Iterator f(begin());
-               Iterator e(end());
-               while (f!=e) {
+               iterator f(begin());
+               iterator e(end());
+
+               while (f != e) {
                        if (*f == key)
                                return f;
+
                        ++f;
                }
+
                return e;
        }
 
 public:
-       void clear() { super::clear(); }
+       void clear()
+       {
+               super::clear();
+       }
 
        void set(const KeyPress &key)
        {
@@ -65,14 +75,16 @@ class KeyList : protected core::list<KeyPress>
 
        void unset(const KeyPress &key)
        {
-               Iterator p(find(key));
+               iterator p(find(key));
+
                if (p != end())
                        erase(p);
        }
 
        void toggle(const KeyPress &key)
        {
-               Iterator p(this->find(key));
+               iterator p(this->find(key));
+
                if (p != end())
                        erase(p);
                else
@@ -97,7 +109,7 @@ class InputHandler
 
        virtual bool isKeyDown(const KeyPress &keyCode) = 0;
        virtual bool wasKeyDown(const KeyPress &keyCode) = 0;
-       
+
        virtual v2s32 getMousePos() = 0;
        virtual void setMousePos(s32 x, s32 y) = 0;
 
@@ -113,34 +125,31 @@ class InputHandler
        virtual bool getRightReleased() = 0;
        virtual void resetLeftReleased() = 0;
        virtual void resetRightReleased() = 0;
-       
+
        virtual s32 getMouseWheel() = 0;
 
-       virtual void step(float dtime) {};
+       virtual void step(float dtime) {}
 
-       virtual void clear() {};
+       virtual void clear() {}
 };
 
 class ChatBackend;  /* to avoid having to include chat.h */
 struct SubgameSpec;
 
-void the_game(
-       bool &kill,
-       bool random_input,
-       InputHandler *input,
-       IrrlichtDevice *device,
-       gui::IGUIFont* font,
-       std::string map_dir,
-       std::string playername,
-       std::string password,
-       std::string address, // If "", local server is used
-       u16 port,
-       std::wstring &error_message,
-       std::string configpath,
-       ChatBackend &chat_backend,
-       const SubgameSpec &gamespec, // Used for local game
-       bool simple_singleplayer_mode
-);
+void the_game(bool *kill,
+               bool random_input,
+               InputHandler *input,
+               IrrlichtDevice *device,
+               const std::string &map_dir,
+               const std::string &playername,
+               const std::string &password,
+               const std::string &address, // If "", local server is used
+               u16 port,
+               std::string &error_message,
+               ChatBackend &chat_backend,
+               bool *reconnect_requested,
+               const SubgameSpec &gamespec, // Used for local game
+               bool simple_singleplayer_mode);
 
 #endif