diff --git a/server/netgame.h b/server/netgame.h index c47ffad..5634f22 100644 --- a/server/netgame.h +++ b/server/netgame.h @@ -7,6 +7,7 @@ class CNetGame // size: W: 14808 L: 14816 { private: + CGameMode *m_pGameMode; CFilterScripts *m_pFilterScripts; CPlayerPool *m_pPlayerPool; @@ -18,28 +19,33 @@ private: CLabelPool *m_pLabelPool; CGangZonePool *m_pGangZonePool; CActorPool *m_pActorPool; + int m_iCurrentGameModeIndex; int m_iCurrentGameModeRepeat; BOOL m_bFirstGameModeLoaded; - CScriptHttps* m_pScriptHttps; - CScriptTimers* m_pScriptTimers; + + CScriptHttps *m_pScriptHttps; + CScriptTimers *m_pScriptTimers; + RakServerInterface *m_pRak; - int m_iLastServerTickUpdate; - int m_iServerTickCount; - int m_iServerTickRate; + + int m_iLastServerTickUpdate; + int m_iServerTickCount; + int m_iServerTickRate; + BOOL m_bLanMode; int m_iShowPlayerMarkers; bool m_bShowNameTags; BYTE m_byteWorldTime; bool m_bAllowWeapons; // Allow weapons in interiors bool m_bStuntBonus; // Insane stunt bonusses enabled? - char field_5C; + char field_5C; BYTE m_byteWeather; int m_iGameState; float m_fGravity; int m_iDeathDropMoney; - char field_6A; - char field_6B; + char field_6A; + char field_6B; bool m_bLimitGlobalChatRadius; // limit global player chat to other players within a certain radius bool m_bUseCJWalk; float m_fGlobalChatRadius; // limit global chat radius @@ -50,11 +56,10 @@ private: bool m_bLimitPlayerMarkerRadius; float m_fPlayerMarkerRadius; BOOL m_bVehicleFriendlyFire; + #ifndef WIN32 double m_dElapsedTime; #endif - int m_iSpawnsAvailable; - PLAYER_SPAWN_INFO m_AvailableSpawns[319]; public: @@ -74,6 +79,9 @@ public: void LoadBanList(); + // CLASS SYSTEM + int m_iSpawnsAvailable; + PLAYER_SPAWN_INFO m_AvailableSpawns[MAX_SPAWNS]; DWORD GetTime(); };