Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-12 01:28:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix CEntitySystem::GetEntityInstance nullptr handling

Browse Source
This commit is contained in:
GAMMACASE committed 2023-12-24 14:56:13 +03:00
1 parent 31c4dfa372
commit 423d825ea1
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
public/entity2/entitysystem.h
+7 -6
View File
@@ -279,14 +279,15 @@ public:
virtual void UpdateOnRemove(int nCount, const EntityDeletion_t *pDeletion) = 0;
public:
CEntityIdentity* GetEntityIdentity(CEntityIndex entnum);
CEntityIdentity* GetEntityIdentity(const CEntityHandle& hEnt);
CEntityIdentity *GetEntityIdentity( CEntityIndex entnum );
CEntityIdentity *GetEntityIdentity( const CEntityHandle &hEnt );
inline CEntityInstance* GetEntityInstance(CEntityIndex entnum) { return GetEntityIdentity(entnum)->m_pInstance; }
inline CEntityInstance* GetEntityInstance(const CEntityHandle& hEnt) { return GetEntityIdentity(hEnt)->m_pInstance; }
inline CEntityInstance *GetEntityInstance( CEntityIdentity *ident ) { return ident ? ident->m_pInstance : nullptr; }
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*>(GetEntityIdentity(entnum)->m_pInstance); }
inline CBaseEntity* GetBaseEntity(const CEntityHandle& hEnt) { return static_cast<CBaseEntity*>(GetEntityIdentity(hEnt)->m_pInstance); }
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()