UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed regressions in a988c42d4248:

Browse Source 
* Fixed crash when prop/data ent is invalid.
* Restored GetEntPropEnt/GetEntDataEnt2 functionality when logical ent support is not available.
This commit is contained in:
Nicholas Hastings 2012-12-17 14:33:57 -05:00
parent ab06cf4788
commit 80f7e3092b
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/smn_entities.cpp
View File

@ -620,14 +620,12 @@ static cell_t GetEntDataEnt2(IPluginContext *pContext, const cell_t *params)
}
CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
int index = hndl.GetEntryIndex();
CBaseEntity *pHandleEntity = g_HL2.ReferenceToEntity(hndl.GetEntryIndex());
CEntInfo *pInfo = g_HL2.LookupEntity(index);
if (pInfo->m_SerialNumber != hndl.GetSerialNumber())
if (!pHandleEntity || hndl != reinterpret_cast<IHandleEntity *>(pHandleEntity)->GetRefEHandle())
return -1;
int ref = g_HL2.IndexToReference(index);
return g_HL2.ReferenceToBCompatRef(ref);
return g_HL2.EntityToBCompatRef(pHandleEntity);
}
/* THIS GUY IS DEPRECATED. */
@ -1498,14 +1496,12 @@ static cell_t GetEntPropEnt(IPluginContext *pContext, const cell_t *params)
}
CBaseHandle &hndl = *(CBaseHandle *)((uint8_t *)pEntity + offset);
int index = hndl.GetEntryIndex();
CBaseEntity *pHandleEntity = g_HL2.ReferenceToEntity(hndl.GetEntryIndex());
CEntInfo *pInfo = g_HL2.LookupEntity(index);
if (pInfo->m_SerialNumber != hndl.GetSerialNumber())
if (!pHandleEntity || hndl != reinterpret_cast<IHandleEntity *>(pHandleEntity)->GetRefEHandle())
return -1;
int ref = g_HL2.IndexToReference(index);
return g_HL2.ReferenceToBCompatRef(ref);
return g_HL2.EntityToBCompatRef(pHandleEntity);
}
static cell_t SetEntPropEnt(IPluginContext *pContext, const cell_t *params)