diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h index 43e49d32..c288a048 100644 --- a/reaction/cgame/cg_local.h +++ b/reaction/cgame/cg_local.h @@ -1408,8 +1408,11 @@ sfxHandle_t CG_CustomSound( int clientNum, const char *soundName ); // void CG_BuildSolidList( void ); int CG_PointContents( const vec3_t point, int passEntityNum ); -void CG_Trace( trace_t *result, const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, +//Elder: try this +void CG_Trace( trace_t *result, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int skipNumber, int mask ); +//void CG_Trace( trace_t *result, const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, + //int skipNumber, int mask ); void CG_PredictPlayerState( void ); void CG_LoadDeferredPlayers( void ); @@ -1638,7 +1641,7 @@ clipHandle_t trap_CM_TempBoxModel( const vec3_t mins, const vec3_t maxs ); int trap_CM_PointContents( const vec3_t p, clipHandle_t model ); int trap_CM_TransformedPointContents( const vec3_t p, clipHandle_t model, const vec3_t origin, const vec3_t angles ); void trap_CM_BoxTrace( trace_t *results, const vec3_t start, const vec3_t end, - vec3_t mins, vec3_t maxs, + const vec3_t mins, const vec3_t maxs, clipHandle_t model, int brushmask ); void trap_CM_TransformedBoxTrace( trace_t *results, const vec3_t start, const vec3_t end, const vec3_t mins, const vec3_t maxs, diff --git a/reaction/cgame/cg_predict.c b/reaction/cgame/cg_predict.c index d8706699..9681f5b5 100644 --- a/reaction/cgame/cg_predict.c +++ b/reaction/cgame/cg_predict.c @@ -120,9 +120,12 @@ static void CG_ClipMoveToEntities ( const vec3_t start, const vec3_t mins, const /* ================ CG_Trace + +Elder: changed header - added 'const' to mins and maxs so VMs can compile +Also check cg_syscalls.c and cg_local.h ================ */ -void CG_Trace( trace_t *result, const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, +void CG_Trace( trace_t *result, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int skipNumber, int mask ) { trace_t t; diff --git a/reaction/cgame/cg_syscalls.c b/reaction/cgame/cg_syscalls.c index 92ed6454..857dbaae 100644 --- a/reaction/cgame/cg_syscalls.c +++ b/reaction/cgame/cg_syscalls.c @@ -123,7 +123,7 @@ int trap_CM_TransformedPointContents( const vec3_t p, clipHandle_t model, const } void trap_CM_BoxTrace( trace_t *results, const vec3_t start, const vec3_t end, - vec3_t mins, vec3_t maxs, + const vec3_t mins, const vec3_t maxs, clipHandle_t model, int brushmask ) { syscall( CG_CM_BOXTRACE, results, start, end, mins, maxs, model, brushmask ); }