Use configured bind_address for HTTPFetch

[oweals/minetest.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 3c127539a52d5bf0a450d20b2e6dd9385a495c8e..1c831c530067527c3bda16135109ec2728eae465 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -20,20 +20,21 @@ 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());
+               const_iterator f(begin());
+               const_iterator e(end());
                while (f!=e) {
                        if (*f == key)
                                return f;
@@ -42,10 +43,10 @@ class KeyList : protected core::list<KeyPress>
                return e;
        }
 
-       virtual Iterator find(const KeyPress &key)
+       virtual iterator find(const KeyPress &key)
        {
-               Iterator f(begin());
-               Iterator e(end());
+               iterator f(begin());
+               iterator e(end());
                while (f!=e) {
                        if (*f == key)
                                return f;
@@ -65,14 +66,14 @@ public:
 
        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
@@ -136,7 +137,6 @@ void the_game(
        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