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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server.cpp b/src/server.cpp index e8fdea7d1..921dd14de 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1490,7 +1490,7 @@ void Server::SendBreath(u16 peer_id, u16 breath) Send(&pkt); } -void Server::SendAccessDenied(u16 peer_id, AccessDeniedCode reason, const std::wstring &custom_reason) +void Server::SendAccessDenied(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason) { DSTACK(__FUNCTION_NAME); @@ -2535,7 +2535,7 @@ void Server::RespawnPlayer(u16 peer_id) } } -void Server::DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::wstring &custom_reason) +void Server::DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason) { DSTACK(__FUNCTION_NAME); |