Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 12:06:07 +08:00
Code Activity

Update INetworkMessages, INetworkMessageInternal & CNetMessage

Browse Source 
After 8/8/2024 CS2 update
This commit is contained in:
GAMMACASE
2024-08-09 03:48:23 +03:00
parent fda9cb0325
commit 1a19a2cca1
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/networksystem/inetworkmessages.h
View File

@ -71,13 +71,10 @@ public:
virtual bool UnserializeMessageInternal( bf_read &pBuf, CNetMessage *pData ) = 0; virtual bool UnserializeMessageInternal( bf_read &pBuf, CNetMessage *pData ) = 0;
virtual bool SerializeMessageInternal( bf_write &pBuf, const CNetMessage *pData ) = 0; virtual bool SerializeMessageInternal( bf_write &pBuf, const CNetMessage *pData ) = 0;
// Returns nullptr if failed to unserialize, reason is written to err_reason
virtual CNetMessage *UnserializeFromStream(bf_read &pBuf, CUtlString &err_reason) = 0;
virtual bool SerializeAbstract(bf_write &pBuf, INetworkMessageInternal *pNetMessage, const CNetMessage *pData) = 0; virtual bool SerializeAbstract(bf_write &pBuf, INetworkMessageInternal *pNetMessage, const CNetMessage *pData) = 0;
// Returns true if the buffer is fully read, false if there's still data left
virtual bool UnserializeAbstract(bf_read &pBuf, INetworkMessageInternal *pNetMessage, CNetMessage *pData) = 0;
virtual bool UnserializeAbstract(bf_read &pBuf, INetworkMessageInternal **pNetMessage, CNetMessage **pData) = 0;
virtual CNetMessage *AllocateNetMessageAbstract(INetworkMessageInternal *pNetMessage) = 0;
virtual CNetMessage *AllocateAndCopyConstructNetMessageAbstract(INetworkMessageInternal *pNetMessage, const CNetMessage *pFrom) = 0; virtual CNetMessage *AllocateAndCopyConstructNetMessageAbstract(INetworkMessageInternal *pNetMessage, const CNetMessage *pFrom) = 0;
virtual void DeallocateNetMessageAbstract(INetworkMessageInternal *pNetMessage, CNetMessage *pData) = 0; virtual void DeallocateNetMessageAbstract(INetworkMessageInternal *pNetMessage, CNetMessage *pData) = 0;

2
public/networksystem/inetworkserializer.h
View File

@ -66,8 +66,6 @@ public:
virtual void SwitchMode( NetworkValidationMode_t nMode ) = 0; virtual void SwitchMode( NetworkValidationMode_t nMode ) = 0;
virtual CNetMessage *AllocateMessage() = 0; virtual CNetMessage *AllocateMessage() = 0;
virtual void DeallocateMessage( CNetMessage *pMsg ) = 0;
virtual CNetMessage *AllocateAndCopyConstructNetMessage( const CNetMessage *pOther ) = 0;
// Calls to INetworkMessages::SerializeMessageInternal // Calls to INetworkMessages::SerializeMessageInternal
virtual bool Serialize( bf_write &pBuf, const CNetMessage *pData ) = 0; virtual bool Serialize( bf_write &pBuf, const CNetMessage *pData ) = 0;

21
public/networksystem/netmessage.h
View File

@ -13,18 +13,18 @@ class CNetMessagePB;
class CNetMessage class CNetMessage
{ {
public: public:
// Disabled as per CNetMessagePB note
CNetMessage() = delete;
CNetMessage( const CNetMessage & ) = delete;
virtual ~CNetMessage() {} virtual ~CNetMessage() {}
// Returns the underlying proto object // Returns the underlying proto object
virtual void *AsProto() const = 0; virtual void *AsProto() const = 0;
virtual void *AsProto2() const = 0; virtual void *AsProto2() const = 0;
virtual INetworkMessageInternal *GetNetMessage() const virtual INetworkMessageInternal *GetNetMessage() const = 0;
{ virtual CNetMessage *CopyConstruct( const CNetMessage *other ) const = 0;
// This shouldn't ever be called and the game provided vtable should be called instead!
Assert(0);
return nullptr;
}
// Helper function to cast up the abstract message to a concrete CNetMessagePB<T> type. // Helper function to cast up the abstract message to a concrete CNetMessagePB<T> type.
// Doesn't do any validity checks itself! // Doesn't do any validity checks itself!
@ -39,6 +39,9 @@ public:
{ {
return static_cast<CNetMessagePB<T> *>(this); return static_cast<CNetMessagePB<T> *>(this);
} }
private:
char unk001[32];
}; };
// AMNOTE: This is a stub class over real CNetMessagePB! // AMNOTE: This is a stub class over real CNetMessagePB!
@ -55,10 +58,10 @@ public:
template<typename PROTO_TYPE> template<typename PROTO_TYPE>
class CNetMessagePB : public CNetMessage, public PROTO_TYPE class CNetMessagePB : public CNetMessage, public PROTO_TYPE
{ {
private: public:
// Prevent manual construction of this object as per the comment above // Prevent manual construction of this object as per the comment above
CNetMessagePB() { }; CNetMessagePB() = delete;
CNetMessagePB( const CNetMessagePB & ) { }; CNetMessagePB( const CNetMessagePB & ) = delete;
}; };
#endif // NETMESSAGE_H #endif // NETMESSAGE_H