From b15d848c668508b8420e2dd733d4f509bad558bd Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 1 Apr 2023 01:51:39 +0200
Subject: [PATCH] Cleanup 'user_creds_s'

Light cleanup.
---
 r5dev/engine/server/server.cpp | 12 ++++++------
 r5dev/engine/server/server.h   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/r5dev/engine/server/server.cpp b/r5dev/engine/server/server.cpp
index 89df487e..d913a000 100644
--- a/r5dev/engine/server/server.cpp
+++ b/r5dev/engine/server/server.cpp
@@ -85,20 +85,20 @@ int CServer::GetNumClients(void) const
 //---------------------------------------------------------------------------------
 bool CServer::AuthClient(user_creds_s* pChallenge)
 {
-	char* pUserID = pChallenge->m_pUserID;
-	uint64_t nNucleusID = pChallenge->m_nNucleusID;
+	char* pszPersonaName = pChallenge->personaName;
+	uint64_t nNucleusID = pChallenge->personaId;
 
 	char pszAddresBuffer[INET6_ADDRSTRLEN]; // Render the client's address.
-	pChallenge->m_nAddr.ToString(pszAddresBuffer, sizeof(pszAddresBuffer));
+	pChallenge->netAdr.ToString(pszAddresBuffer, sizeof(pszAddresBuffer));
 
 	const bool bEnableLogging = sv_showconnecting->GetBool();
 	if (bEnableLogging)
 		DevMsg(eDLL_T::SERVER, "Processing connectionless challenge for '%s' ('%llu')\n", pszAddresBuffer, nNucleusID);
 
 	// Only proceed connection if the client's name is valid and UTF-8 encoded.
-	if (!pUserID || !pUserID[0] || !IsValidUTF8(pUserID) || !IsValidPersonaName(pUserID))
+	if (!VALID_CHARSTAR(pszPersonaName) || !IsValidUTF8(pszPersonaName) || !IsValidPersonaName(pszPersonaName))
 	{
-		RejectConnection(m_Socket, &pChallenge->m_nAddr, "#Valve_Reject_Invalid_Name");
+		RejectConnection(m_Socket, &pChallenge->netAdr, "#Valve_Reject_Invalid_Name");
 		if (bEnableLogging)
 			Warning(eDLL_T::SERVER, "Connection rejected for '%s' ('%llu' has an invalid name!)\n", pszAddresBuffer, nNucleusID);
 
@@ -109,7 +109,7 @@ bool CServer::AuthClient(user_creds_s* pChallenge)
 	{
 		if (g_pBanSystem->IsBanned(pszAddresBuffer, nNucleusID))
 		{
-			RejectConnection(m_Socket, &pChallenge->m_nAddr, "#Valve_Reject_Banned");
+			RejectConnection(m_Socket, &pChallenge->netAdr, "#Valve_Reject_Banned");
 			if (bEnableLogging)
 				Warning(eDLL_T::SERVER, "Connection rejected for '%s' ('%llu' is banned from this server!)\n", pszAddresBuffer, nNucleusID);
 
diff --git a/r5dev/engine/server/server.h b/r5dev/engine/server/server.h
index 8b0010eb..4dd35fb3 100644
--- a/r5dev/engine/server/server.h
+++ b/r5dev/engine/server/server.h
@@ -18,12 +18,12 @@ enum class server_state_t
 
 struct user_creds_s
 {
-	netadr_t m_nAddr;
-	int32_t  m_nProtocolVer;
-	int32_t  m_nChallenge;
-	uint32_t m_nReservation;
-	uint64_t m_nNucleusID;
-	char* m_pUserID;
+	netadr_t netAdr;
+	int32_t  protocolVer;
+	int32_t  challenge;
+	uint32_t reservation;
+	uint64_t personaId;
+	char* personaName;
 };
 
 class CServer : public IConnectionlessPacketHandler