diff options
author | ShadowNinja <shadowninja@minetest.net> | 2015-03-27 20:24:04 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2015-03-27 20:24:04 -0400 |
commit | 30075467b84c79ff21736d6c447746caef07dcd0 (patch) | |
tree | cfdfe0ed15d488840e03597bca6c2320a8dec55e /src/network/clientpackethandler.cpp | |
parent | 3d53c90d4b34563ef27bc38da211dab91b72d321 (diff) | |
download | minetest-30075467b84c79ff21736d6c447746caef07dcd0.tar.gz minetest-30075467b84c79ff21736d6c447746caef07dcd0.tar.bz2 minetest-30075467b84c79ff21736d6c447746caef07dcd0.zip |
Change error_message from wstring to string
This removes a lot of narrow/wide conversions where a wide string was never used.
Diffstat (limited to 'src/network/clientpackethandler.cpp')
-rw-r--r-- | src/network/clientpackethandler.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index 5acf04f91..4afe2a2ce 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -140,7 +140,7 @@ void Client::handleCommand_AccessDenied(NetworkPacket* pkt) // to be processed even if the serialisation format has // not been agreed yet, the same as TOCLIENT_INIT. m_access_denied = true; - m_access_denied_reason = L"Unknown"; + m_access_denied_reason = "Unknown"; if (pkt->getCommand() == TOCLIENT_ACCESS_DENIED) { if (pkt->getSize() < 1) @@ -149,7 +149,9 @@ void Client::handleCommand_AccessDenied(NetworkPacket* pkt) u8 denyCode = SERVER_ACCESSDENIED_UNEXPECTED_DATA; *pkt >> denyCode; if (denyCode == SERVER_ACCESSDENIED_CUSTOM_STRING) { - *pkt >> m_access_denied_reason; + std::wstring wide_reason; + *pkt >> wide_reason; + m_access_denied_reason = wide_to_narrow(wide_reason); } else if (denyCode < SERVER_ACCESSDENIED_MAX) { m_access_denied_reason = accessDeniedStrings[denyCode]; @@ -159,7 +161,9 @@ void Client::handleCommand_AccessDenied(NetworkPacket* pkt) // for compat with old clients else { if (pkt->getSize() >= 2) { - *pkt >> m_access_denied_reason; + std::wstring wide_reason; + *pkt >> wide_reason; + m_access_denied_reason = wide_to_narrow(wide_reason); } } } |