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

Merge pull request #130 from Arkshine/fix-regression

Browse Source 
Fix a crash regression in #112
This commit is contained in:
Vincent Herbet 2014-09-15 13:27:49 +02:00
commit 87774ae21f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/engine/forwards.cpp
View File

@ -253,9 +253,9 @@ void pfnTouch(edict_t *pToucher, edict_t *pTouched)
META_RES res=MRES_IGNORED; META_RES res=MRES_IGNORED;
for (i=0; i<Touches.length(); i++) for (i=0; i<Touches.length(); i++)
{ {
if (Touches[i]->Toucher.length() == 0) if (Touches[i]->Toucher.isVoid())
{ {
if (Touches[i]->Touched.length() == 0) if (Touches[i]->Touched.isVoid())
{ {
retVal = MF_ExecuteForward(Touches[i]->Forward, (cell)ptrIndex, (cell)ptdIndex); retVal = MF_ExecuteForward(Touches[i]->Forward, (cell)ptrIndex, (cell)ptdIndex);
if (retVal & 2/*PLUGIN_HANDLED_MAIN*/) if (retVal & 2/*PLUGIN_HANDLED_MAIN*/)
@ -270,7 +270,7 @@ void pfnTouch(edict_t *pToucher, edict_t *pTouched)
res=MRES_SUPERCEDE; res=MRES_SUPERCEDE;
} }
} else if (Touches[i]->Toucher.compare(ptrClass)==0) { } else if (Touches[i]->Toucher.compare(ptrClass)==0) {
if (Touches[i]->Touched.length() == 0) if (Touches[i]->Touched.isVoid())
{ {
retVal = MF_ExecuteForward(Touches[i]->Forward, (cell)ptrIndex, (cell)ptdIndex); retVal = MF_ExecuteForward(Touches[i]->Forward, (cell)ptrIndex, (cell)ptdIndex);
if (retVal & 2/*PLUGIN_HANDLED_MAIN*/) if (retVal & 2/*PLUGIN_HANDLED_MAIN*/)