Refactor for better readability

Author: slurmlord

Generals/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp

@@ -292,17 +292,22 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
 			// TheSuperHackers @bugfix slurmlord 18/09/2025 need to validate the name of the connecting player before
 			// allowing them to join to prevent messing up the format of game state string. Commas, colons, semicolons etc.
 			// should not be in a player name. It should also not consist of only space characters.
-			constexpr WideChar IllegalNameChars[] = L",:;|\f\n\r\t\v";
-			if (canJoin && (wcscspn(msg->name, IllegalNameChars) || wcsspn(msg->name, L" ") == wcslen(msg->name)))
+			if (canJoin)
 			{
-				// Just deny with a duplicate name reason, for backwards compatibility with retail
-				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-				reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
-				reply.GameNotJoined.gameIP = m_localIP;
-				reply.GameNotJoined.playerIP = senderIP;
-				canJoin = false;
+				constexpr WideChar IllegalNameChars[] = L",:;|\f\n\r\t\v";
+				const Bool containsIllegalChars = wcscspn(msg->name, IllegalNameChars);
+				const Bool isEffectivelyEmpty = wcsspn(msg->name, L" ") == wcslen(msg->name);
+				if (containsIllegalChars || isEffectivelyEmpty)
+				{
+					// Just deny with a duplicate name reason, for backwards compatibility with retail
+					reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
+					reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
+					reply.GameNotJoined.gameIP = m_localIP;
+					reply.GameNotJoined.playerIP = senderIP;
+					canJoin = false;
 
-				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of illegal characters in the player name."));
+					DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of illegal characters in the player name."));
+				}
 			}	
 
 			// Then see if the player has a duplicate name

GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp

@@ -293,17 +293,22 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
 			// TheSuperHackers @bugfix slurmlord 18/09/2025 need to validate the name of the connecting player before
 			// allowing them to join to prevent messing up the format of game state string. Commas, colons, semicolons etc.
 			// should not be in a player name. It should also not consist of only space characters.
-			constexpr WideChar IllegalNameChars[] = L",:;|\f\n\r\t\v";
-			if (canJoin && (wcscspn(msg->name, IllegalNameChars) || wcsspn(msg->name, L" ") == wcslen(msg->name)))
+			if (canJoin)
 			{
-				// Just deny with a duplicate name reason, for backwards compatibility with retail
-				reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
-				reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
-				reply.GameNotJoined.gameIP = m_localIP;
-				reply.GameNotJoined.playerIP = senderIP;
-				canJoin = false;
+				constexpr WideChar IllegalNameChars[] = L",:;|\f\n\r\t\v";
+				const Bool containsIllegalChars = wcscspn(msg->name, IllegalNameChars);
+				const Bool isEffectivelyEmpty = wcsspn(msg->name, L" ") == wcslen(msg->name);
+				if (containsIllegalChars || isEffectivelyEmpty)
+				{
+					// Just deny with a duplicate name reason, for backwards compatibility with retail
+					reply.LANMessageType = LANMessage::MSG_JOIN_DENY;
+					reply.GameNotJoined.reason = LANAPIInterface::RET_DUPLICATE_NAME;
+					reply.GameNotJoined.gameIP = m_localIP;
+					reply.GameNotJoined.playerIP = senderIP;
+					canJoin = false;
 
-				DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of illegal characters in the player name."));
+					DEBUG_LOG(("LANAPI::handleRequestJoin - join denied because of illegal characters in the player name."));
+				}
 			}
 
 			// Then see if the player has a duplicate name