YGGverse
/
xash3d-fwgs
mirror of https://github.com/YGGverse/xash3d-fwgs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

engine: remove useless pfnHullPointContents wrapper

pull/2/head
Alibek Omarov 2 years ago
parent
787d3bc5dd
commit
2479d28cd5
4 changed files with 4 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      engine/client/cl_pmove.c
  2. 2
      engine/common/pm_local.h
  3. 2
      engine/common/pm_trace.c
  4. 7
      engine/server/sv_pmove.c

7
engine/client/cl_pmove.c
Unescape View File

@ -707,11 +707,6 @@ static int GAME_EXPORT pfnTruePointContents( float *p )
return PM_TruePointContents( clgame.pmove, 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 ) 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 ); 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_StuckTouch = pfnStuckTouch;
clgame.pmove->PM_PointContents = (void*)PM_CL_PointContents; clgame.pmove->PM_PointContents = (void*)PM_CL_PointContents;
clgame.pmove->PM_TruePointContents = pfnTruePointContents; clgame.pmove->PM_TruePointContents = pfnTruePointContents;
clgame.pmove->PM_HullPointContents = pfnHullPointContents; clgame.pmove->PM_HullPointContents = PM_HullPointContents;
clgame.pmove->PM_PlayerTrace = pfnPlayerTrace; clgame.pmove->PM_PlayerTrace = pfnPlayerTrace;
clgame.pmove->PM_TraceLine = PM_CL_TraceLine; clgame.pmove->PM_TraceLine = PM_CL_TraceLine;
clgame.pmove->RandomLong = COM_RandomLong; clgame.pmove->RandomLong = COM_RandomLong;

2
engine/common/pm_local.h
Unescape View File

@ -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 ); 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 ); 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_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_TruePointContents( playermove_t *pmove, const vec3_t p );
int PM_PointContents( 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 ); float PM_TraceModel( playermove_t *pmove, physent_t *pe, float *start, float *end, trace_t *trace );

2
engine/common/pm_trace.c
Unescape View File

@ -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; mplane_t *plane;

7
engine/server/sv_pmove.c
Unescape View File

@ -379,11 +379,6 @@ static int GAME_EXPORT pfnTruePointContents( float *p )
return PM_TruePointContents( svgame.pmove, 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 ) 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 ); 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_StuckTouch = pfnStuckTouch;
svgame.pmove->PM_PointContents = pfnPointContents; svgame.pmove->PM_PointContents = pfnPointContents;
svgame.pmove->PM_TruePointContents = pfnTruePointContents; svgame.pmove->PM_TruePointContents = pfnTruePointContents;
svgame.pmove->PM_HullPointContents = pfnHullPointContents; svgame.pmove->PM_HullPointContents = PM_HullPointContents;
svgame.pmove->PM_PlayerTrace = pfnPlayerTrace; svgame.pmove->PM_PlayerTrace = pfnPlayerTrace;
svgame.pmove->PM_TraceLine = pfnTraceLine; svgame.pmove->PM_TraceLine = pfnTraceLine;
svgame.pmove->RandomLong = COM_RandomLong; svgame.pmove->RandomLong = COM_RandomLong;

Write Preview
Loading…
Cancel
Save