diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-01-31 00:33:23 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-01-31 00:42:08 +1000 |
| commit | 38561023b468b923aa2b7957b807fa2700ea59ce (patch) | |
| tree | f352ea600922f1a5da602aca51d85f74682cdcda /src/client.h | |
| parent | 4d15d631349005528e8578a5750ad9a1b8cefe39 (diff) | |
| download | minetest-38561023b468b923aa2b7957b807fa2700ea59ce.tar.gz minetest-38561023b468b923aa2b7957b807fa2700ea59ce.tar.bz2 minetest-38561023b468b923aa2b7957b807fa2700ea59ce.zip | |
Fix local map saving when joining a local server from the server tab
Disables local map saving for all local server types
See: https://github.com/minetest/minetest/issues/2024
Diffstat (limited to 'src/client.h')
| -rw-r--r-- | src/client.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/client.h b/src/client.h index 9b1b63c0b..fd7e5f08d 100644 --- a/src/client.h +++ b/src/client.h @@ -305,7 +305,6 @@ public: IrrlichtDevice *device, const char *playername, std::string password, - bool is_simple_singleplayer_game, MapDrawControl &control, IWritableTextureSource *tsrc, IWritableShaderSource *shsrc, @@ -325,11 +324,14 @@ public: bool isShutdown(); + /* The name of the local player should already be set when calling this, as it is sent in the initialization. */ - void connect(Address address); + void connect(Address address, + const std::string &address_name, + bool is_local_server); /* Stuff that references the environment is valid only as @@ -477,6 +479,10 @@ private: void peerAdded(con::Peer *peer); void deletingPeer(con::Peer *peer, bool timeout); + void initLocalMapSaving(const Address &address, + const std::string &hostname, + bool is_local_server); + void ReceiveAll(); void Receive(); |