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

Revert 1e3832a942ade577d39463979441651b13a5eee4 (#554)

Browse Source
This commit is contained in:
Vincent Herbet 2018-09-08 09:41:29 +02:00 committed by GitHub
parent 9a95fd9886
commit b4927bfb1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/fun/fun.cpp
View File

@ -315,8 +315,6 @@ static cell AMX_NATIVE_CALL set_user_hitzones(AMX *amx, cell *params)
Players.SetBodyHits(attacker, target, hitzones); Players.SetBodyHits(attacker, target, hitzones);
} }
g_pengfuncsTable_Post->pfnTraceLine = Players.HaveBodyHits() ? TraceLine_Post : nullptr;
return 1; return 1;
} }
@ -484,8 +482,10 @@ int ClientConnect(edict_t *pPlayer, const char *pszName, const char *pszAddress,
RETURN_META_VALUE(MRES_IGNORED, 0); 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)) if (ptr->pHit && (ptr->pHit->v.flags & (FL_CLIENT | FL_FAKECLIENT))
&& shooter && (shooter->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);
} }

2
modules/fun/moduleconfig.h
View File

@ -232,7 +232,7 @@
// #define FN_SetOrigin SetOrigin // #define FN_SetOrigin SetOrigin
// #define FN_EmitSound EmitSound // #define FN_EmitSound EmitSound
// #define FN_EmitAmbientSound EmitAmbientSound // #define FN_EmitAmbientSound EmitAmbientSound
// #define FN_TraceLine TraceLine #define FN_TraceLine TraceLine
// #define FN_TraceToss TraceToss // #define FN_TraceToss TraceToss
// #define FN_TraceMonsterHull TraceMonsterHull // #define FN_TraceMonsterHull TraceMonsterHull
// #define FN_TraceHull TraceHull // #define FN_TraceHull TraceHull