From f8631330473b3f14bf45a25924fa8f3d250806c9 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 28 Apr 2016 19:30:20 -0400 Subject: [PATCH] Touchups. --- public/cdll_int.h | 3 ++- public/datacache/imdlcache.h | 26 +++++++++++++------------- public/dt_common.h | 2 ++ public/eiface.h | 2 +- public/inetchannel.h | 4 ++-- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/public/cdll_int.h b/public/cdll_int.h index ba73b0f2..031da9a5 100644 --- a/public/cdll_int.h +++ b/public/cdll_int.h @@ -82,7 +82,8 @@ namespace vgui typedef struct player_info_s { DECLARE_BYTESWAP_DATADESC(); - uint64 unknown; + // version for future compatibility + uint64 version; // network xuid uint64 xuid; // scoreboard information diff --git a/public/datacache/imdlcache.h b/public/datacache/imdlcache.h index 5be2ac3d..c990e5c0 100644 --- a/public/datacache/imdlcache.h +++ b/public/datacache/imdlcache.h @@ -217,7 +217,7 @@ public: virtual void ReloadVCollide( MDLHandle_t handle ) = 0; virtual bool ReleaseAnimBlockAllocator() = 0; - virtual void RestoreHardwareData(MDLHandle_t handle, FSAsyncControl_t* unk2, FSAsyncControl_t* unk3) = 0; + virtual bool RestoreHardwareData( MDLHandle_t handle, FSAsyncControl_t *pAsyncVTXControl, FSAsyncControl_t *pAsyncVVDControl ) = 0; virtual void DisableVCollideLoad() = 0; virtual void EnableVCollideLoad() = 0; virtual void DisableFileNotFoundWarnings() = 0; @@ -225,19 +225,19 @@ public: virtual void ProcessPendingHardwareRestore() = 0; virtual void UnloadQueuedHardwareData() = 0; virtual void DumpDictionaryState() = 0; - virtual MDLHandle_t CreateCombinedModel(char const* name) = 0; - virtual bool CreateCombinedModel(MDLHandle_t handle) = 0; - virtual bool SetCombineModels(MDLHandle_t handle, CUtlVector const& unk2) = 0; - virtual bool FinishCombinedModel(MDLHandle_t handle, void* unk2, void* unk3) = 0; - virtual bool IsCombinedPlaceholder(MDLHandle_t handle) = 0; - virtual bool IsCombinedModel(MDLHandle_t handle) = 0; - virtual int GetNumCombinedSubModels(MDLHandle_t handle) = 0; - virtual void GetCombinedSubModelFilename(MDLHandle_t handle, int iSubModel, char* szOutput, int iOutputBufferLength) = 0; - virtual KeyValues* GetCombinedMaterialKV(MDLHandle_t handle, int unk2) = 0; + virtual MDLHandle_t CreateCombinedModel( const char *name ) = 0; + virtual bool CreateCombinedModel( MDLHandle_t handle ) = 0; + virtual bool SetCombineModels( MDLHandle_t handle, const CUtlVector &unk2 ) = 0; + virtual bool FinishCombinedModel( MDLHandle_t handle, void *unk2, void *unk3 ) = 0; + virtual bool IsCombinedPlaceholder( MDLHandle_t handle ) = 0; + virtual bool IsCombinedModel( MDLHandle_t handle ) = 0; + virtual int GetNumCombinedSubModels( MDLHandle_t handle ) = 0; + virtual void GetCombinedSubModelFilename( MDLHandle_t handle, int iSubModel, char *szOutput, int iOutputBufferLength ) = 0; + virtual KeyValues *GetCombinedMaterialKV( MDLHandle_t handle, int unk2) = 0; virtual void UpdateCombiner() = 0; - virtual void GetCombinedInternalAsset(ECombinedAsset combinedAsset, char const* unk2, int * unk3) = 0; - virtual void SetCombinerFlags(MDLHandle_t handle) = 0; - virtual void ClearCombinerFlags(MDLHandle_t handle) = 0; + virtual void GetCombinedInternalAsset( ECombinedAsset combinedAsset, const char *unk2, int *unk3 ) = 0; + virtual void SetCombinerFlags( MDLHandle_t handle ) = 0; + virtual void ClearCombinerFlags( MDLHandle_t handle ) = 0; virtual void DebugCombinerInfo() = 0; }; diff --git a/public/dt_common.h b/public/dt_common.h index 41f97dfb..b1c37948 100644 --- a/public/dt_common.h +++ b/public/dt_common.h @@ -83,6 +83,8 @@ #define SPROP_CHANGES_OFTEN (1<<18) // this is an often changed field, moved to head of sendtable so it gets a small index +#define SPROP_VARINT (1<<19) // use var int encoded (google protobuf style), note you want to include SPROP_UNSIGNED if needed, its more efficient + #define SPROP_NUMFLAGBITS_NETWORKED 19 diff --git a/public/eiface.h b/public/eiface.h index df94bd63..d9b5d47f 100644 --- a/public/eiface.h +++ b/public/eiface.h @@ -434,7 +434,7 @@ public: virtual CGamestatsData *GetGamestatsData() = 0; // Returns the SteamID of the specified player. It'll be NULL if the player hasn't authenticated yet. - virtual const CSteamID *GetClientSteamID( edict_t *pPlayerEdict ) = 0; + virtual const CSteamID *GetClientSteamID( const edict_t *pPlayerEdict ) = 0; // Returns the SteamID of the game server virtual const CSteamID *GetGameServerSteamID() = 0; diff --git a/public/inetchannel.h b/public/inetchannel.h index 16578c08..e1e30c22 100644 --- a/public/inetchannel.h +++ b/public/inetchannel.h @@ -90,7 +90,6 @@ public: virtual void SetFileTransmissionMode(bool bBackgroundMode) = 0; virtual void SetCompressionMode( bool bUseCompression ) = 0; virtual unsigned int RequestFile(const char *filename, bool isReplayDemoFile) = 0; - virtual float GetTimeSinceLastReceived( void ) const = 0; // get time since last received packet in seconds virtual void SetMaxBufferSize(bool bReliable, int nBytes, bool bVoice = false ) = 0; @@ -109,8 +108,9 @@ public: virtual void DetachSplitPlayer( int nSplitPlayerSlot ) = 0; virtual bool IsRemoteDisconnected() const = 0; - virtual bool WasLastMessageReliable() const = 0; + virtual unsigned int GetChannelEncryptionKey( void ) const = 0; + virtual bool EnqueueVeryLargeAsyncTransfer(INetMessage &msg) = 0; };