Sync with 'alliedmodders/cs2'

Wend4r · Jan 3, 2025 · 66b4d40 · 66b4d40
2 parents 4542852 + f3b44f2
commit 66b4d40
Show file tree

Hide file tree

Showing 5 changed files with 1,229 additions and 1,230 deletions.
diff --git a/public/iserver.h b/public/iserver.h
@@ -41,6 +41,7 @@ class KeyValues3;
 class CPureServerWhitelist;
 class CServerSideClientBase;
 class CCLCMsg_SplitPlayerConnect_t;
+class C2S_CONNECT_Message;
 class CNetworkStringTableContainer;
 class CNetworkServerSpawnGroupCreatePrerequisites;
 
@@ -189,7 +190,7 @@ class CNetworkGameServerBase : public INetworkGameServer, protected IConnectionl
 
 	virtual void	StartHLTVMaster() = 0;
 
-	virtual CServerSideClientBase *ConnectClient( const char *pszName, ns_address *pAddr, int socket, CCLCMsg_SplitPlayerConnect_t *pSplitPlayer,
+	virtual CServerSideClientBase *ConnectClient( const char *pszName, ns_address *pAddr, void *pNetInfo, C2S_CONNECT_Message *pConnectMsg,
 												  const char *pszChallenge, const byte *pAuthTicket, int nAuthTicketLength, bool bIsLowViolence ) = 0;
 	virtual CServerSideClientBase *CreateNewClient( CPlayerSlot slot ) = 0;
 

diff --git a/public/tier1/UtlSortVector.h b/public/tier1/UtlSortVector.h
@@ -244,7 +244,7 @@ void CUtlSortVector<T, LessFunc, BaseVector>::QuickSort( LessFunc& less, int nLo
 		ctx.m_pLessContext = m_pLessContext;
 		ctx.m_pLessFunc = &less;
 
-		qsort_s( Base(), Count(), sizeof(T), (QSortCompareFunc_t)&CUtlSortVector<T, LessFunc>::CompareHelper, &ctx );
+		qsort_s( this->Base(), this->Count(), sizeof(T), (QSortCompareFunc_t)&CUtlSortVector<T, LessFunc>::CompareHelper, &ctx );
 	}
 #else
 	typedef int (__cdecl *QSortCompareFunc_t)( const void *, const void *);