[server] Change member variable names in CPlayerPool

server/main.h

@@ -6,6 +6,7 @@
 // DEFINES
 // -------
 
+#define MAX_PLAYER_NAME			24
 #define MAX_PLAYERS				1000
 #define MAX_VEHICLES			2000
 #define MAX_FILTER_SCRIPTS		16
@@ -82,6 +83,7 @@ typedef unsigned short VEHICLEID;
 #include "gamemodes.h"
 #include "filterscripts.h"
 #include "netrpc.h"
+#include "player.h"
 #include "playerpool.h"
 #include "vehiclepool.h"
 #include "pickuppool.h"
@@ -99,6 +101,7 @@ typedef unsigned short VEHICLEID;
 // ---------
 
 extern CConsole* pConsole;
+extern CNetGame* pNetGame;
 
 // -------------------
 // FUNCTION PROTOTYPES

server/player.cpp

@@ -0,0 +1,3 @@
+
+#include "main.h"
+

server/player.h

@@ -0,0 +1,17 @@
+
+#ifndef SAMPSRV_PLAYER_H
+#define SAMPSRV_PLAYER_H
+
+class CPlayer
+{
+private:
+	char _gap0[11486];
+
+public:
+
+};
+
+#endif
+
+//----------------------------------------------------
+// EOF

server/playerpool.cpp

@@ -6,7 +6,7 @@ CPlayerPool::CPlayerPool()
 {
 	for(PLAYERID playerId = 0; playerId < MAX_PLAYERS; playerId++) {
 		m_bPlayerSlotState[playerId] = FALSE;
-		field_2599C[playerId] = 0;
+		m_pPlayers[playerId] = NULL;
 		field_23A5C[playerId] = 0;
 		field_3E8C[playerId] = pNetGame->GetTime();
 	}

server/playerpool.h

@@ -18,12 +18,19 @@ private:
 	int field_FA8;
 	int m_iPlayerScore[MAX_PLAYERS];
 	int m_iPlayerMoney[MAX_PLAYERS];
-	char gap2EEC[4000];
+	int m_iPlayerDrunkLevel[MAX_PLAYERS];
 	DWORD field_3E8C[1000];
-	int field_23A5C[1000];
+	CHAR m_szPlayerClientID[MAX_PLAYERS][101];
+	CHAR m_szPlayerVersion[MAX_PLAYERS][25];
+	int field_23A5C[MAX_PLAYERS];
 	BOOL m_bPlayerSlotState[MAX_PLAYERS];
-	int field_2599C[1000];
+	CPlayer *m_pPlayers[MAX_PLAYERS];
-	char gap2693C[41000];
+	CHAR m_szPlayerName[MAX_PLAYERS][MAX_PLAYER_NAME+1];
+	BOOL m_bIsAnAdmin[MAX_PLAYERS];
+	BOOL m_bIsAnNPC[MAX_PLAYERS];
+
+	char _gap2CAE4[8000];
+
 	int field_30964;
 	int field_30968;
 	int field_3096C;

server/server.vcproj

@@ -350,6 +350,16 @@
 				RelativePath=".\scrtimers.h">
 			</File>
 		</Filter>
+		<Filter
+			Name="player"
+			Filter="">
+			<File
+				RelativePath=".\player.cpp">
+			</File>
+			<File
+				RelativePath=".\player.h">
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\actorpool.cpp">
 		</File>