diff options
Diffstat (limited to 'src/server/sv_world.c')
| -rw-r--r-- | src/server/sv_world.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/sv_world.c b/src/server/sv_world.c index 2060985d..d40cc217 100644 --- a/src/server/sv_world.c +++ b/src/server/sv_world.c @@ -456,7 +456,7 @@ typedef struct { trace_t trace; int passEntityNum; int contentmask; - int capsule; + traceType_t collisionType; } moveclip_t; @@ -466,7 +466,7 @@ SV_ClipToEntity ==================== */ -void SV_ClipToEntity( trace_t *trace, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int entityNum, int contentmask, int capsule ) { +void SV_ClipToEntity( trace_t *trace, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int entityNum, int contentmask, traceType_t type ) { sharedEntity_t *touch; clipHandle_t clipHandle; float *origin, *angles; @@ -494,7 +494,7 @@ void SV_ClipToEntity( trace_t *trace, const vec3_t start, const vec3_t mins, con CM_TransformedBoxTrace ( trace, (float *)start, (float *)end, (float *)mins, (float *)maxs, clipHandle, contentmask, - origin, angles, capsule); + origin, angles, type); if ( trace->fraction < 1 ) { trace->entityNum = touch->s.number; @@ -566,7 +566,7 @@ void SV_ClipMoveToEntities( moveclip_t *clip ) { CM_TransformedBoxTrace ( &trace, (float *)clip->start, (float *)clip->end, (float *)clip->mins, (float *)clip->maxs, clipHandle, clip->contentmask, - origin, angles, clip->capsule); + origin, angles, clip->collisionType); if ( trace.allsolid ) { clip->trace.allsolid = qtrue; @@ -598,7 +598,7 @@ Moves the given mins/maxs volume through the world from start to end. passEntityNum and entities owned by passEntityNum are explicitly not checked. ================== */ -void SV_Trace( trace_t *results, const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, int passEntityNum, int contentmask, int capsule ) { +void SV_Trace( trace_t *results, const vec3_t start, vec3_t mins, vec3_t maxs, const vec3_t end, int passEntityNum, int contentmask, traceType_t type ) { moveclip_t clip; int i; @@ -612,7 +612,7 @@ void SV_Trace( trace_t *results, const vec3_t start, vec3_t mins, vec3_t maxs, c Com_Memset ( &clip, 0, sizeof ( moveclip_t ) ); // clip to world - CM_BoxTrace( &clip.trace, start, end, mins, maxs, 0, contentmask, capsule ); + CM_BoxTrace( &clip.trace, start, end, mins, maxs, 0, contentmask, type ); clip.trace.entityNum = clip.trace.fraction != 1.0 ? ENTITYNUM_WORLD : ENTITYNUM_NONE; if ( clip.trace.fraction == 0 ) { *results = clip.trace; @@ -626,7 +626,7 @@ void SV_Trace( trace_t *results, const vec3_t start, vec3_t mins, vec3_t maxs, c clip.mins = mins; clip.maxs = maxs; clip.passEntityNum = passEntityNum; - clip.capsule = capsule; + clip.collisionType = type; // create the bounding box of the entire move // we can limit it to the part of the move not |