X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame.h;h=a2c1fc09cc48eb7cb7d9790ab6cf6c3216ff8911;hb=45589fae58157c8a66c640a1db5795a42a86fc1c;hp=01e955ecdb37bb164432f0702c672cc28b81c21c;hpb=967f25461bbde28dbc0247fa1c491e9d9938a5b2;p=dragonfireclient.git

diff --git a/src/game.h b/src/game.h
index 01e955ecd..a2c1fc09c 100644
--- 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,21 +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;
@@ -43,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;
@@ -66,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
@@ -123,6 +123,7 @@ class InputHandler
 };
 
 class ChatBackend;  /* to avoid having to include chat.h */
+struct SubgameSpec;
 
 void the_game(
 	bool &kill,
@@ -133,11 +134,13 @@ void the_game(
 	std::string map_dir,
 	std::string playername,
 	std::string password,
-	std::string address,
+	std::string address, // If "", local server is used
 	u16 port,
 	std::wstring &error_message,
 	std::string configpath,
-	ChatBackend &chat_backend
+	ChatBackend &chat_backend,
+	const SubgameSpec &gamespec, // Used for local game
+	bool simple_singleplayer_mode
 );
 
 #endif