summaryrefslogtreecommitdiff
path: root/src/game.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-11 14:54:23 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-11 14:54:23 +0200
commit7f7fb9750df3aceec48f65cee657e15364e0a911 (patch)
tree6ab56068b0d4df0f669da1bae259061fd011da62 /src/game.h
parentdf190b8f87a563648337b3c90a4de75e6ffc09a1 (diff)
downloadminetest-7f7fb9750df3aceec48f65cee657e15364e0a911.tar.gz
minetest-7f7fb9750df3aceec48f65cee657e15364e0a911.tar.bz2
minetest-7f7fb9750df3aceec48f65cee657e15364e0a911.zip
command-line/world game selection
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game.h b/src/game.h
index 01e955ecd..4ca5a2433 100644
--- a/src/game.h
+++ b/src/game.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common_irrlicht.h"
#include <string>
-
#include "keycode.h"
class KeyList : protected core::list<KeyPress>
@@ -123,6 +122,7 @@ public:
};
class ChatBackend; /* to avoid having to include chat.h */
+struct SubgameSpec;
void the_game(
bool &kill,
@@ -133,11 +133,12 @@ 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
);
#endif