Fix rebasing

teemods · Feb 5, 2024 · 30c3500 · 30c3500
1 parent b865c04
commit 30c3500
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/src/engine/server/authmanager.h b/src/engine/server/authmanager.h
@@ -44,4 +44,4 @@ class CAuthManager
 	int NumNonDefaultKeys() const;
 };
 
-#endif // ENGINE_SERVER_AUTHMANAGER_H
+#endif //ENGINE_SERVER_AUTHMANAGER_H
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
@@ -1095,7 +1095,7 @@ void CServer::InitDnsbl(int ClientID)
 {
 	NETADDR Addr = *m_NetServer.ClientAddr(ClientID);
 
-	// TODO: support ipv6
+	//TODO: support ipv6
 	if(Addr.type != NETTYPE_IPV4)
 		return;
 
@@ -1341,8 +1341,7 @@ void CServer::UpdateClientRconCommands()
 
 	if(m_aClients[ClientID].m_State != CClient::STATE_EMPTY && m_aClients[ClientID].m_Authed)
 	{
-		int ConsoleAccessLevel = m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD :
-																				      IConsole::ACCESS_LEVEL_HELPER;
+		int ConsoleAccessLevel = m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : IConsole::ACCESS_LEVEL_HELPER;
 		for(int i = 0; i < MAX_RCONCMD_SEND && m_aClients[ClientID].m_pRconCmdToSend; ++i)
 		{
 			SendRconCmdAdd(m_aClients[ClientID].m_pRconCmdToSend, ClientID);
@@ -1681,9 +1680,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 					Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 					m_RconClientID = ClientID;
 					m_RconAuthLevel = m_aClients[ClientID].m_Authed;
-					Console()->SetAccessLevel(m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD :
-																	 m_aClients[ClientID].m_Authed == AUTHED_HELPER      ? IConsole::ACCESS_LEVEL_HELPER :
-																							       IConsole::ACCESS_LEVEL_USER);
+					Console()->SetAccessLevel(m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : m_aClients[ClientID].m_Authed == AUTHED_MOD ? IConsole::ACCESS_LEVEL_MOD : m_aClients[ClientID].m_Authed == AUTHED_HELPER ? IConsole::ACCESS_LEVEL_HELPER : IConsole::ACCESS_LEVEL_USER);
 					{
 						CRconClientLogger Logger(this, ClientID);
 						CLogScope Scope(&Logger);
@@ -3062,9 +3059,8 @@ void CServer::ConStatus(IConsole::IResult *pResult, void *pUser)
 			if(pThis->Config()->m_SvDnsbl)
 			{
 				const char *pDnsblStr = pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_WHITELISTED ? "white" :
-							pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED ? "black" :
-							pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_PENDING     ? "pending" :
-																"n/a";
+																pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_BLACKLISTED ? "black" :
+																									pThis->m_aClients[i].m_DnsblState == CClient::DNSBL_STATE_PENDING ? "pending" : "n/a";
 
 				str_format(aDnsblStr, sizeof(aDnsblStr), " dnsbl=%s", pDnsblStr);
 			}
@@ -3073,10 +3069,9 @@ void CServer::ConStatus(IConsole::IResult *pResult, void *pUser)
 			aAuthStr[0] = '\0';
 			if(pThis->m_aClients[i].m_AuthKey >= 0)
 			{
-				const char *pAuthStr = pThis->m_aClients[i].m_Authed == AUTHED_ADMIN  ? "(Admin)" :
-						       pThis->m_aClients[i].m_Authed == AUTHED_MOD    ? "(Mod)" :
-						       pThis->m_aClients[i].m_Authed == AUTHED_HELPER ? "(Helper)" :
-													"";
+				const char *pAuthStr = pThis->m_aClients[i].m_Authed == AUTHED_ADMIN ? "(Admin)" :
+												       pThis->m_aClients[i].m_Authed == AUTHED_MOD ? "(Mod)" :
+																		     pThis->m_aClients[i].m_Authed == AUTHED_HELPER ? "(Helper)" : "";
 
 				str_format(aAuthStr, sizeof(aAuthStr), " key=%s %s", pThis->m_AuthManager.KeyIdent(pThis->m_aClients[i].m_AuthKey), pAuthStr);
 			}
@@ -3577,8 +3572,8 @@ void CServer::LogoutClient(int ClientID, const char *pReason)
 	if(!IsSixup(ClientID))
 	{
 		CMsgPacker Msg(NETMSG_RCON_AUTH_STATUS, true);
-		Msg.AddInt(0); // authed
-		Msg.AddInt(0); // cmdlist
+		Msg.AddInt(0); //authed
+		Msg.AddInt(0); //cmdlist
 		SendMsg(&Msg, MSGFLAG_VITAL, ClientID);
 	}
 	else

diff --git a/src/engine/server/server.h b/src/engine/server/server.h
@@ -204,7 +204,7 @@ class CServer : public IServer
 	IEngineMap *m_pMap;
 
 	int64_t m_GameStartTime;
-	// int m_CurrentGameTick;
+	//int m_CurrentGameTick;
 
 	enum
 	{
@@ -281,9 +281,9 @@ class CServer : public IServer
 
 	void DemoRecorder_HandleAutoStart() override;
 
-	// int Tick()
+	//int Tick()
 	int64_t TickStartTime(int Tick);
-	// int TickSpeed()
+	//int TickSpeed()
 
 	int Init();