From 30075467b84c79ff21736d6c447746caef07dcd0 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Fri, 27 Mar 2015 20:24:04 -0400
Subject: Change error_message from wstring to string

This removes a lot of narrow/wide conversions where a wide string was never used.
---
 src/network/clientpackethandler.cpp | 10 +++++---
 src/network/networkprotocol.h       | 48 ++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 27 deletions(-)

(limited to 'src/network')

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);
 		}
 	}
 }
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 599b70006..3a52ddacd 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -861,36 +861,36 @@ enum ToServerCommand
 };
 
 enum AccessDeniedCode {
-	SERVER_ACCESSDENIED_WRONG_PASSWORD = 0,
-	SERVER_ACCESSDENIED_UNEXPECTED_DATA = 1,
-	SERVER_ACCESSDENIED_SINGLEPLAYER = 2,
-	SERVER_ACCESSDENIED_WRONG_VERSION = 3,
-	SERVER_ACCESSDENIED_WRONG_CHARS_IN_NAME = 4,
-	SERVER_ACCESSDENIED_WRONG_NAME = 5,
-	SERVER_ACCESSDENIED_TOO_MANY_USERS = 6,
-	SERVER_ACCESSDENIED_EMPTY_PASSWORD = 7,
-	SERVER_ACCESSDENIED_ALREADY_CONNECTED = 8,
-	SERVER_ACCESSDENIED_SERVER_FAIL = 9,
-	SERVER_ACCESSDENIED_CUSTOM_STRING = 10,
-	SERVER_ACCESSDENIED_MAX = 11,
+	SERVER_ACCESSDENIED_WRONG_PASSWORD,
+	SERVER_ACCESSDENIED_UNEXPECTED_DATA,
+	SERVER_ACCESSDENIED_SINGLEPLAYER,
+	SERVER_ACCESSDENIED_WRONG_VERSION,
+	SERVER_ACCESSDENIED_WRONG_CHARS_IN_NAME,
+	SERVER_ACCESSDENIED_WRONG_NAME,
+	SERVER_ACCESSDENIED_TOO_MANY_USERS,
+	SERVER_ACCESSDENIED_EMPTY_PASSWORD,
+	SERVER_ACCESSDENIED_ALREADY_CONNECTED,
+	SERVER_ACCESSDENIED_SERVER_FAIL,
+	SERVER_ACCESSDENIED_CUSTOM_STRING,
+	SERVER_ACCESSDENIED_MAX,
 };
 
 enum NetProtoCompressionMode {
 	NETPROTO_COMPRESSION_ZLIB = 0,
 };
 
-const static std::wstring accessDeniedStrings[SERVER_ACCESSDENIED_MAX] = {
-	L"Invalid password",
-	L"Your client sent something server didn't expect. Try reconnecting or updating your client",
-	L"The server is running in simple singleplayer mode. You cannot connect.",
-	L"Your client's version is not supported.\nPlease contact server administrator.",
-	L"Name contains unallowed characters",
-	L"Name is not allowed",
-	L"Too many users.",
-	L"Empty passwords are disallowed. Set a password and try again.",
-	L"Another client is connected with this name. If your client closed unexpectedly, try again in a minute.",
-	L"Server authenticator failed. Maybe the servers has some problems."
-	L"",
+const static std::string accessDeniedStrings[SERVER_ACCESSDENIED_MAX] = {
+	"Invalid password",
+	"Your client sent something the server didn't expect.  Try reconnecting or updating your client",
+	"The server is running in simple singleplayer mode.  You cannot connect.",
+	"Your client's version is not supported.\nPlease contact server administrator.",
+	"Player name contains disallowed characters.",
+	"Player name not allowed.",
+	"Too many users.",
+	"Empty passwords are disallowed.  Set a password and try again.",
+	"Another client is connected with this name.  If your client closed unexpectedly, try again in a minute.",
+	"Server authention failed.  This is likely a server error."
+	"",
 };
 
 #endif
-- 
cgit v1.2.3