From fe3915a2a5978e58bed38d7d411d85a45ff4a2af Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 20 Oct 2011 21:45:47 -0400 Subject: [PATCH] Some changes for 2011-10-13 engine update (bug 5140, r=DS). --- public/edict.h | 3 ++- public/eiface.h | 7 +++++-- public/iclient.h | 4 +++- public/inetchannel.h | 2 ++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/public/edict.h b/public/edict.h index 98875288..271c470a 100644 --- a/public/edict.h +++ b/public/edict.h @@ -204,7 +204,8 @@ public: #endif // NOTE: this is in the edict instead of being accessed by a virtual because the engine needs fast access to it. - int m_NetworkSerialNumber; // Game DLL sets this when it gets a serial number for its EHANDLE. + short m_NetworkSerialNumber; // Game DLL sets this when it gets a serial number for its EHANDLE. + short m_iIndex; // NOTE: this is in the edict instead of being accessed by a virtual because the engine needs fast access to it. IServerNetworkable *m_pNetworkable; diff --git a/public/eiface.h b/public/eiface.h index 9adffc85..35ee4a2f 100644 --- a/public/eiface.h +++ b/public/eiface.h @@ -391,7 +391,8 @@ public: #define INTERFACEVERSION_SERVERGAMEDLL_VERSION_4 "ServerGameDLL004" #define INTERFACEVERSION_SERVERGAMEDLL_VERSION_5 "ServerGameDLL005" -#define INTERFACEVERSION_SERVERGAMEDLL "ServerGameDLL006" +#define INTERFACEVERSION_SERVERGAMEDLL_VERSION_6 "ServerGameDLL006" +#define INTERFACEVERSION_SERVERGAMEDLL "ServerGameDLL007" //----------------------------------------------------------------------------- // Purpose: These are the interfaces that the game .dll exposes to the engine @@ -541,7 +542,7 @@ public: virtual void CheckTransmit( CCheckTransmitInfo *pInfo, const unsigned short *pEdictIndices, int nEdicts ) = 0; }; -#define INTERFACEVERSION_SERVERGAMECLIENTS "ServerGameClients003" +#define INTERFACEVERSION_SERVERGAMECLIENTS "ServerGameClients004" //----------------------------------------------------------------------------- // Purpose: Player / Client related functions @@ -603,6 +604,8 @@ public: // The client has submitted a keyvalues command virtual void ClientCommandKeyValues( edict_t *pEntity, KeyValues *pKeyValues ) = 0; + + virtual void ClientSpawned( edict_t *pEntity ) = 0; }; #define INTERFACEVERSION_UPLOADGAMESTATS "ServerUploadGameStats001" diff --git a/public/iclient.h b/public/iclient.h index bd5a70ec..e7457d30 100644 --- a/public/iclient.h +++ b/public/iclient.h @@ -23,7 +23,7 @@ public: virtual ~IClient() {} // connect client - virtual void Connect(const char * szName, int nUserID, INetChannel *pNetChannel, bool bFakePlayer) = 0; + virtual void Connect(const char * szName, int nUserID, INetChannel *pNetChannel, bool bFakePlayer, int unknown1) = 0; // set the client in a pending state waiting for a new game virtual void Inactivate( void ) = 0; @@ -74,6 +74,8 @@ public: virtual bool IsFakeClient( void ) const = 0; // returns true, if client is a HLTV proxy virtual bool IsHLTV( void ) const = 0; + virtual bool IsReplay( void ) const = 0; + // returns true, if client hears this player virtual bool IsHearingClient(int index) const = 0; // returns true, if client hears this player by proximity diff --git a/public/inetchannel.h b/public/inetchannel.h index 1d014062..2ac5e872 100644 --- a/public/inetchannel.h +++ b/public/inetchannel.h @@ -71,6 +71,8 @@ public: virtual void SetFileTransmissionMode(bool bBackgroundMode) = 0; virtual void SetCompressionMode( bool bUseCompression ) = 0; virtual unsigned int RequestFile(const char *filename) = 0; + + virtual float GetTimeSinceLastReceived( void ) const = 0; virtual void SetMaxBufferSize(bool bReliable, int nBytes, bool bVoice = false ) = 0;