Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-01-03 16:13:22 +08:00
Code

Remove CBaseEntity definition

Browse Source 
It's better for thirdparty to handle definition of it, we can use CEntityInstance instead since it's a base class here.
This commit is contained in:
GAMMACASE 2024-05-08 21:57:44 +03:00
parent 5b106aaf14
commit 74283e80d8
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/server/baseentity.h
View File

@ -11,12 +11,6 @@
#pragma once
#endif
#include "entityinstance.h"
class CBaseEntity : public CEntityInstance
{
};
#if 0
#define TEAMNUM_NUM_BITS 6
#include <ctype.h>
@ -2912,6 +2906,4 @@ FORCEINLINE bool EntityNamesMatch( const char *pszQuery, string_t nameToMatch )
return false;
}
#endif
#endif // BASEENTITY_H

2
game/shared/ehandle.h
View File

@ -20,7 +20,7 @@
inline CEntityInstance* CEntityHandle::Get() const
{
return GameEntitySystem()->GetBaseEntity( *this );
return GameEntitySystem()->GetEntityInstance( *this );
}
// -------------------------------------------------------------------------------------------------- //

1
public/entity2/entityidentity.h
View File

@ -116,7 +116,6 @@ public:
uint32 m_fDataObjectTypes; // 0x3c
ChangeAccessorFieldPathIndex_t m_PathIndex; // 0x40
private:
uint16 m_Padding; // 0x42
void* m_pAttributes; // 0x48 - CUtlObjectAttributeTable<CEntityIdentity, CUtlStringToken>
void* m_pRenderAttrs; // 0x50 - CRenderAttributesDoubleBuffered
public:

4
public/entity2/entitysystem.h
View File

@ -18,7 +18,6 @@
#include "vscript/ivscript.h"
#include "eiface.h"
#include "resourcefile/resourcetype.h"
#include "baseentity.h"
#include "entityhandle.h"
#include "concreteentitylist.h"
#include "entitydatainstantiator.h"
@ -258,9 +257,6 @@ public:
inline CEntityInstance *GetEntityInstance( CEntityIndex entnum ) { return GetEntityInstance( GetEntityIdentity( entnum ) ); }
inline CEntityInstance *GetEntityInstance( const CEntityHandle &hEnt ) { return GetEntityInstance( GetEntityIdentity( hEnt ) ); }
inline CBaseEntity *GetBaseEntity( CEntityIndex entnum ) { return static_cast<CBaseEntity *>(GetEntityInstance( entnum )); }
inline CBaseEntity *GetBaseEntity( const CEntityHandle &hEnt ) { return static_cast<CBaseEntity *>(GetEntityInstance( hEnt )); }
inline void AddEntityKeyValuesAllocatorRef() { ++m_nEntityKeyValuesAllocatorRefCount; }
inline void ReleaseEntityKeyValuesAllocatorRef()
{

6
public/entityhandle.h
View File

@ -111,9 +111,9 @@ inline int CEntityHandle::GetSerialNumber() const
return m_Parts.m_Serial;
}
inline int CEntityHandle::ToInt() const
{
return m_Index;
inline int CEntityHandle::ToInt() const
{
return m_Index;
}
inline bool CEntityHandle::operator !=(const CEntityHandle& other) const