reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-28 14:38:11 +03:00
Code Issues Projects Releases Wiki Activity

Update world.cpp (#985)

Browse Source
This commit is contained in:
Francisco Muñoz 2023-09-24 17:40:50 -03:00 committed by GitHub
parent 6f031901cf
commit 5ec8c29185
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rehlds/engine/world.cpp
View File

@ -1190,13 +1190,15 @@ void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
if (touch->v.solid == SOLID_TRIGGER) if (touch->v.solid == SOLID_TRIGGER)
Sys_Error("%s: Trigger in clipping list", __func__); Sys_Error("%s: Trigger in clipping list", __func__);
#ifndef REHLDS_OPT_PEDANTIC
if (gNewDLLFunctions.pfnShouldCollide && !gNewDLLFunctions.pfnShouldCollide(touch, clip->passedict)) if (gNewDLLFunctions.pfnShouldCollide && !gNewDLLFunctions.pfnShouldCollide(touch, clip->passedict))
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
// https://github.com/dreamstalker/rehlds/issues/46 // https://github.com/dreamstalker/rehlds/issues/46
continue; continue;
#else #else
return; return;
#endif #endif // REHLDS_FIXES
#endif // REHLDS_OPT_PEDANTIC
// monsterclip filter // monsterclip filter
if (touch->v.solid == SOLID_BSP) if (touch->v.solid == SOLID_BSP)
@ -1248,6 +1250,16 @@ void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
continue; // don't clip against owner continue; // don't clip against owner
} }
#ifdef REHLDS_OPT_PEDANTIC
if (gNewDLLFunctions.pfnShouldCollide && !gNewDLLFunctions.pfnShouldCollide(touch, clip->passedict))
#ifdef REHLDS_FIXES
// https://github.com/dreamstalker/rehlds/issues/46
continue;
#else
return;
#endif // REHLDS_FIXES
#endif // REHLDS_OPT_PEDANTIC
trace_t trace; trace_t trace;
if (touch->v.flags & FL_MONSTER) if (touch->v.flags & FL_MONSTER)
trace = SV_ClipMoveToEntity(touch, clip->start, clip->mins2, clip->maxs2, clip->end); trace = SV_ClipMoveToEntity(touch, clip->start, clip->mins2, clip->maxs2, clip->end);