Add replacements to schematics

[dragonfireclient.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index b74a7a8da33c620a6a0e3c2e553c2106e5f07797..a2c1fc09cc48eb7cb7d9790ab6cf6c3216ff8911 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
@@ -23,17 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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 @@ 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