From b4927bfb1f409f52467c40742503b58ba97e8562 Mon Sep 17 00:00:00 2001 From: Vincent Herbet Date: Sat, 8 Sep 2018 09:41:29 +0200 Subject: [PATCH] Revert 1e3832a942ade577d39463979441651b13a5eee4 (#554) --- modules/fun/fun.cpp | 8 ++++---- modules/fun/moduleconfig.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/fun/fun.cpp b/modules/fun/fun.cpp index 33a1e377..53be8696 100644 --- a/modules/fun/fun.cpp +++ b/modules/fun/fun.cpp @@ -315,8 +315,6 @@ static cell AMX_NATIVE_CALL set_user_hitzones(AMX *amx, cell *params) Players.SetBodyHits(attacker, target, hitzones); } - g_pengfuncsTable_Post->pfnTraceLine = Players.HaveBodyHits() ? TraceLine_Post : nullptr; - return 1; } @@ -484,8 +482,10 @@ int ClientConnect(edict_t *pPlayer, const char *pszName, const char *pszAddress, RETURN_META_VALUE(MRES_IGNORED, 0); } -void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t *shooter, TraceResult *ptr) +void TraceLine(const float *v1, const float *v2, int fNoMonsters, edict_t *shooter, TraceResult *ptr) { + TRACE_LINE(v1, v2, fNoMonsters, shooter, ptr); + if (ptr->pHit && (ptr->pHit->v.flags & (FL_CLIENT | FL_FAKECLIENT)) && shooter && (shooter->v.flags & (FL_CLIENT | FL_FAKECLIENT)) ) { @@ -499,7 +499,7 @@ void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t * } } - RETURN_META(MRES_IGNORED); + RETURN_META(MRES_SUPERCEDE); } diff --git a/modules/fun/moduleconfig.h b/modules/fun/moduleconfig.h index 292fb31d..75216a8e 100644 --- a/modules/fun/moduleconfig.h +++ b/modules/fun/moduleconfig.h @@ -232,7 +232,7 @@ // #define FN_SetOrigin SetOrigin // #define FN_EmitSound EmitSound // #define FN_EmitAmbientSound EmitAmbientSound -// #define FN_TraceLine TraceLine +#define FN_TraceLine TraceLine // #define FN_TraceToss TraceToss // #define FN_TraceMonsterHull TraceMonsterHull // #define FN_TraceHull TraceHull