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

Merge pull request #306 from IgnacioFDM/patch-1

Browse Source 
Allow wordspawn in edict/entvars->index type conversion  (bug 6429)
This commit is contained in:
Vincent Herbet 2015-11-06 12:52:42 +01:00
commit 4abeac1231
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/HLTypeConversion.h
View File

@ -77,7 +77,7 @@ class HLTypeConversion
int edict_to_id(edict_t *pEdict) int edict_to_id(edict_t *pEdict)
{ {
if (FNullEnt(pEdict)) if (!pEdict)
{ {
return -1; return -1;
} }
@ -89,7 +89,7 @@ class HLTypeConversion
edict_t* entvar_to_edict(entvars_t *pev) edict_t* entvar_to_edict(entvars_t *pev)
{ {
if (!pev || FNullEnt(pev->pContainingEntity)) if (!pev || !(pev->pContainingEntity))
{ {
return nullptr; return nullptr;
} }
@ -198,7 +198,7 @@ class EHANDLE
edict_t* Get(void) edict_t* Get(void)
{ {
if (!FNullEnt(m_pent)) if (m_pent)
{ {
if (m_pent->serialnumber == m_serialnumber) if (m_pent->serialnumber == m_serialnumber)
{ {
@ -213,7 +213,7 @@ class EHANDLE
edict_t* Set(edict_t *pent) edict_t* Set(edict_t *pent)
{ {
if (!FNullEnt(pent)) if (pent)
{ {
m_pent = pent; m_pent = pent;
m_serialnumber = m_pent->serialnumber; m_serialnumber = m_pent->serialnumber;