diff --git a/engine/client/cl_pmove.c b/engine/client/cl_pmove.c index 1bca399d..8fee4187 100644 --- a/engine/client/cl_pmove.c +++ b/engine/client/cl_pmove.c @@ -707,11 +707,6 @@ static int GAME_EXPORT pfnTruePointContents( float *p ) return PM_TruePointContents( clgame.pmove, p ); } -static int GAME_EXPORT pfnHullPointContents( struct hull_s *hull, int num, float *p ) -{ - return PM_HullPointContents( hull, num, p ); -} - static pmtrace_t GAME_EXPORT pfnPlayerTrace( float *start, float *end, int traceFlags, int ignore_pe ) { return PM_PlayerTraceExt( clgame.pmove, start, end, traceFlags, clgame.pmove->numphysent, clgame.pmove->physents, ignore_pe, NULL ); @@ -795,7 +790,7 @@ void CL_InitClientMove( void ) clgame.pmove->PM_StuckTouch = pfnStuckTouch; clgame.pmove->PM_PointContents = (void*)PM_CL_PointContents; clgame.pmove->PM_TruePointContents = pfnTruePointContents; - clgame.pmove->PM_HullPointContents = pfnHullPointContents; + clgame.pmove->PM_HullPointContents = PM_HullPointContents; clgame.pmove->PM_PlayerTrace = pfnPlayerTrace; clgame.pmove->PM_TraceLine = PM_CL_TraceLine; clgame.pmove->RandomLong = COM_RandomLong; diff --git a/engine/common/pm_local.h b/engine/common/pm_local.h index e2583e20..b2830741 100644 --- a/engine/common/pm_local.h +++ b/engine/common/pm_local.h @@ -36,7 +36,7 @@ hull_t *PM_HullForBsp( physent_t *pe, playermove_t *pmove, float *offset ); qboolean PM_RecursiveHullCheck( hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, pmtrace_t *trace ); pmtrace_t PM_PlayerTraceExt( playermove_t *pm, vec3_t p1, vec3_t p2, int flags, int numents, physent_t *ents, int ignore_pe, pfnIgnore pmFilter ); int PM_TestPlayerPosition( playermove_t *pmove, vec3_t pos, pmtrace_t *ptrace, pfnIgnore pmFilter ); -int PM_HullPointContents( hull_t *hull, int num, const vec3_t p ); +int PM_HullPointContents( hull_t *hull, int num, vec3_t p ); int PM_TruePointContents( playermove_t *pmove, const vec3_t p ); int PM_PointContents( playermove_t *pmove, const vec3_t p ); float PM_TraceModel( playermove_t *pmove, physent_t *pe, float *start, float *end, trace_t *trace ); diff --git a/engine/common/pm_trace.c b/engine/common/pm_trace.c index 375fc9bc..0519149b 100644 --- a/engine/common/pm_trace.c +++ b/engine/common/pm_trace.c @@ -138,7 +138,7 @@ PM_HullPointContents ================== */ -int PM_HullPointContents( hull_t *hull, int num, const vec3_t p ) +int PM_HullPointContents( hull_t *hull, int num, vec3_t p ) { mplane_t *plane; diff --git a/engine/server/sv_pmove.c b/engine/server/sv_pmove.c index 356a4345..c8b0be0a 100644 --- a/engine/server/sv_pmove.c +++ b/engine/server/sv_pmove.c @@ -379,11 +379,6 @@ static int GAME_EXPORT pfnTruePointContents( float *p ) return PM_TruePointContents( svgame.pmove, p ); } -static int GAME_EXPORT pfnHullPointContents( struct hull_s *hull, int num, float *p ) -{ - return PM_HullPointContents( hull, num, p ); -} - static pmtrace_t GAME_EXPORT pfnPlayerTrace( float *start, float *end, int traceFlags, int ignore_pe ) { return PM_PlayerTraceExt( svgame.pmove, start, end, traceFlags, svgame.pmove->numphysent, svgame.pmove->physents, ignore_pe, NULL ); @@ -496,7 +491,7 @@ void SV_InitClientMove( void ) svgame.pmove->PM_StuckTouch = pfnStuckTouch; svgame.pmove->PM_PointContents = pfnPointContents; svgame.pmove->PM_TruePointContents = pfnTruePointContents; - svgame.pmove->PM_HullPointContents = pfnHullPointContents; + svgame.pmove->PM_HullPointContents = PM_HullPointContents; svgame.pmove->PM_PlayerTrace = pfnPlayerTrace; svgame.pmove->PM_TraceLine = pfnTraceLine; svgame.pmove->RandomLong = COM_RandomLong;