reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-04 02:55:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #232 from WPMGPRoSToTeMa/KillMeChecks

Browse Source 
Additional checks for FL_KILLME flag before callbacks (OnTouch and On…
This commit is contained in:
theAsmodai 2016-08-03 19:08:10 +03:00 committed by GitHub
commit 4a7b6cddd7
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rehlds/engine/sv_phys.cpp
View File

@ -176,6 +176,11 @@ void SV_Impact(edict_t *e1, edict_t *e2, trace_t *ptrace)
{ {
SV_SetGlobalTrace(ptrace); SV_SetGlobalTrace(ptrace);
gEntityInterface.pfnTouch(e1, e2); gEntityInterface.pfnTouch(e1, e2);
#ifdef REHLDS_FIXES
if ((e1->v.flags & FL_KILLME) || (e2->v.flags & FL_KILLME))
return;
#endif // REHLDS_FIXES
} }
if (e2->v.solid) if (e2->v.solid)
{ {
@ -784,7 +789,11 @@ void SV_Physics_Pusher(edict_t *ent)
ent->v.angles[i] = fmod(ent->v.angles[i], 3600.0f); ent->v.angles[i] = fmod(ent->v.angles[i], 3600.0f);
} }
if (thinktime > oldltime && ((ent->v.flags & FL_ALWAYSTHINK) || thinktime <= ent->v.ltime)) if (thinktime > oldltime && ((ent->v.flags & FL_ALWAYSTHINK) || thinktime <= ent->v.ltime)
#ifdef REHLDS_FIXES
&& !(ent->v.flags & FL_KILLME)
#endif // REHLDS_FIXES
)
{ {
ent->v.nextthink = 0; ent->v.nextthink = 0;
gGlobalVariables.time = (float) g_psv.time; gGlobalVariables.time = (float) g_psv.time;

5
rehlds/engine/world.cpp
View File

@ -349,6 +349,11 @@ void SV_TouchLinks(edict_t *ent, areanode_t *node)
} }
} }
#ifdef REHLDS_FIXES
if ((ent->v.flags & FL_KILLME) || (touch->v.flags & FL_KILLME))
continue;
#endif // REHLDS_FIXES
if (touch->v.solid == SOLID_TRIGGER if (touch->v.solid == SOLID_TRIGGER
&& ent->v.absmin[0] <= touch->v.absmax[0] && ent->v.absmin[0] <= touch->v.absmax[0]
&& ent->v.absmin[1] <= touch->v.absmax[1] && ent->v.absmin[1] <= touch->v.absmax[1]