Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistency: Replace INDEXENT2 and others things with HLTypeConversion in fakemeta module

Browse Source
This commit is contained in:
Arkshine
2015-10-06 23:53:01 +02:00
parent 9980b7ac62
commit 429a4596c1
12 changed files with 157 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/HLTypeConversion.h
View File

@ -44,6 +44,8 @@ template <typename T>inline void set_pdata(edict_t *pEntity, int offset, T value
}
extern globalvars_t *gpGlobals;
class HLTypeConversion
{
public:
@ -102,7 +104,24 @@ class HLTypeConversion
edict_t* id_to_edict(int index)
{
return static_cast<edict_t*>(m_FirstEdict + index);
if (index < 0 || index >= gpGlobals->maxEntities)
{
return nullptr;
}
if (!index)
{
return m_FirstEdict;
}
auto pEdict = static_cast<edict_t*>(m_FirstEdict + index);
if (pEdict && (pEdict->free || (index > gpGlobals->maxClients && !pEdict->pvPrivateData)))
{
return nullptr;
}
return pEdict;
}
entvars_t* id_to_entvars(int index)