diff options
| author | est31 <MTest31@outlook.com> | 2015-04-22 14:10:39 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-04-22 14:10:39 +0200 |
| commit | ccc09abc2d4a712c17de833d52cb5aa91b7bf980 (patch) | |
| tree | 08b2d18ed3428707ee18f6ac30d8ca788569b9d9 /src/server.h | |
| parent | eec01bc2fabbefbe0d0c008011592d49f8bbd18e (diff) | |
| download | minetest-ccc09abc2d4a712c17de833d52cb5aa91b7bf980.tar.gz minetest-ccc09abc2d4a712c17de833d52cb5aa91b7bf980.tar.bz2 minetest-ccc09abc2d4a712c17de833d52cb5aa91b7bf980.zip | |
Protocol 25: wstring -> string for custom access denial reasons
Also fix std::logic_error when server::DenyAccess() is used with only two arguments.
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server.h b/src/server.h index ba993523b..25ffb7fc6 100644 --- a/src/server.h +++ b/src/server.h @@ -360,7 +360,7 @@ public: void peerAdded(con::Peer *peer); void deletingPeer(con::Peer *peer, bool timeout); - void DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::wstring &custom_reason=NULL); + void DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason=""); void DenyAccess_Legacy(u16 peer_id, const std::wstring &reason); bool getClientConInfo(u16 peer_id, con::rtt_stat_type type,float* retval); bool getClientInfo(u16 peer_id,ClientState* state, u32* uptime, @@ -383,7 +383,7 @@ private: void SendMovement(u16 peer_id); void SendHP(u16 peer_id, u8 hp); void SendBreath(u16 peer_id, u16 breath); - void SendAccessDenied(u16 peer_id, AccessDeniedCode reason, const std::wstring &custom_reason); + void SendAccessDenied(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason); void SendAccessDenied_Legacy(u16 peer_id, const std::wstring &reason); void SendDeathscreen(u16 peer_id,bool set_camera_point_target, v3f camera_point_target); void SendItemDef(u16 peer_id,IItemDefManager *itemdef, u16 protocol_version); |