X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame.h;h=b74a7a8da33c620a6a0e3c2e553c2106e5f07797;hb=2c362badd401dc16d32b543ed15bfcad44f9163b;hp=7cba1299e3e8137561c14c4e9f724e78df343810;hpb=1995b59320fe0fdced55c4605635f38cc42768f1;p=minetest.git

diff --git a/src/game.h b/src/game.h
index 7cba1299e..b74a7a8da 100644
--- a/src/game.h
+++ b/src/game.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2011 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,8 +20,70 @@ 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"
+
+class KeyList : protected core::list<KeyPress>
+{
+	typedef core::list<KeyPress> super;
+	typedef super::Iterator Iterator;
+	typedef super::ConstIterator ConstIterator;
+
+	virtual ConstIterator find(const KeyPress &key) const
+	{
+		ConstIterator f(begin());
+		ConstIterator e(end());
+		while (f!=e) {
+			if (*f == key)
+				return f;
+			++f;
+		}
+		return e;
+	}
+
+	virtual Iterator find(const KeyPress &key)
+	{
+		Iterator f(begin());
+		Iterator e(end());
+		while (f!=e) {
+			if (*f == key)
+				return f;
+			++f;
+		}
+		return e;
+	}
+
+public:
+	void clear() { super::clear(); }
+
+	void set(const KeyPress &key)
+	{
+		if (find(key) == end())
+			push_back(key);
+	}
+
+	void unset(const KeyPress &key)
+	{
+		Iterator p(find(key));
+		if (p != end())
+			erase(p);
+	}
+
+	void toggle(const KeyPress &key)
+	{
+		Iterator p(this->find(key));
+		if (p != end())
+			erase(p);
+		else
+			push_back(key);
+	}
+
+	bool operator[](const KeyPress &key) const
+	{
+		return find(key) != end();
+	}
+};
 
 class InputHandler
 {
@@ -33,8 +95,8 @@ class InputHandler
 	{
 	}
 
-	virtual bool isKeyDown(EKEY_CODE keyCode) = 0;
-	virtual bool wasKeyDown(EKEY_CODE keyCode) = 0;
+	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;
@@ -59,6 +121,9 @@ class InputHandler
 	virtual void clear() {};
 };
 
+class ChatBackend;  /* to avoid having to include chat.h */
+struct SubgameSpec;
+
 void the_game(
 	bool &kill,
 	bool random_input,
@@ -67,9 +132,14 @@ void the_game(
 	gui::IGUIFont* font,
 	std::string map_dir,
 	std::string playername,
-	std::string address,
+	std::string password,
+	std::string address, // If "", local server is used
 	u16 port,
-	std::wstring &error_message
+	std::wstring &error_message,
+	std::string configpath,
+	ChatBackend &chat_backend,
+	const SubgameSpec &gamespec, // Used for local game
+	bool simple_singleplayer_mode
 );
 
 #endif