Created
April 22, 2015 13:05
-
-
Save anonymous/ead6fcad63f34c72c128 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp | |
index 68d4245..bddf8f6 100644 | |
--- a/src/network/clientpackethandler.cpp | |
+++ b/src/network/clientpackethandler.cpp | |
@@ -149,9 +149,7 @@ void Client::handleCommand_AccessDenied(NetworkPacket* pkt) | |
u8 denyCode = SERVER_ACCESSDENIED_UNEXPECTED_DATA; | |
*pkt >> denyCode; | |
if (denyCode == SERVER_ACCESSDENIED_CUSTOM_STRING) { | |
- std::wstring wide_reason; | |
- *pkt >> wide_reason; | |
- m_access_denied_reason = wide_to_narrow(wide_reason); | |
+ *pkt >> m_access_denied_reason; | |
} | |
else if (denyCode < SERVER_ACCESSDENIED_MAX) { | |
m_access_denied_reason = accessDeniedStrings[denyCode]; | |
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp | |
index 955b1a7..6b1d5bc 100644 | |
--- a/src/network/serverpackethandler.cpp | |
+++ b/src/network/serverpackethandler.cpp | |
@@ -217,7 +217,7 @@ void Server::handleCommand_Auth(NetworkPacket* pkt) | |
<< "but it was disallowed for the following reason: " | |
<< reason << std::endl; | |
DenyAccess(pkt->getPeerId(), SERVER_ACCESSDENIED_CUSTOM_STRING, | |
- narrow_to_wide(reason.c_str())); | |
+ reason.c_str()); | |
return; | |
} | |
} | |
diff --git a/src/server.cpp b/src/server.cpp | |
index e8fdea7..921dd14 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); | |
diff --git a/src/server.h b/src/server.h | |
index ba99352..25ffb7f 100644 | |
--- a/src/server.h | |
+++ b/src/server.h | |
@@ -360,7 +360,7 @@ class Server : public con::PeerHandler, public MapEventReceiver, | |
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 @@ class Server : public con::PeerHandler, public MapEventReceiver, | |
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); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment