diff options
| author | Tim Angus <tim@ngus.net> | 2005-12-20 00:53:13 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2005-12-20 00:53:13 +0000 |
| commit | 611eb5ee8a55d5aa473c48f8f9436a01e3f0cdb7 (patch) | |
| tree | e2c52d2d0c43e5343df017c7578fb99275a8bfed /src/server/sv_game.c | |
| parent | 65b823bf367034c204d370a6a73965a196072153 (diff) | |
* New collision type, for improved light flares
Diffstat (limited to 'src/server/sv_game.c')
| -rw-r--r-- | src/server/sv_game.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/sv_game.c b/src/server/sv_game.c index 2d07fab7..b89ea920 100644 --- a/src/server/sv_game.c +++ b/src/server/sv_game.c @@ -226,7 +226,7 @@ void SV_AdjustAreaPortalState( sharedEntity_t *ent, qboolean open ) { SV_GameAreaEntities ================== */ -qboolean SV_EntityContact( vec3_t mins, vec3_t maxs, const sharedEntity_t *gEnt, int capsule ) { +qboolean SV_EntityContact( vec3_t mins, vec3_t maxs, const sharedEntity_t *gEnt, traceType_t type ) { const float *origin, *angles; clipHandle_t ch; trace_t trace; @@ -237,7 +237,7 @@ qboolean SV_EntityContact( vec3_t mins, vec3_t maxs, const sharedEntity_t *gEnt, ch = SV_ClipHandleForEntity( gEnt ); CM_TransformedBoxTrace ( &trace, vec3_origin, vec3_origin, mins, maxs, - ch, -1, origin, angles, capsule ); + ch, -1, origin, angles, type ); return trace.startsolid; } @@ -373,14 +373,14 @@ long SV_GameSystemCalls( long *args ) { case G_ENTITIES_IN_BOX: return SV_AreaEntities( VMA(1), VMA(2), VMA(3), args[4] ); case G_ENTITY_CONTACT: - return SV_EntityContact( VMA(1), VMA(2), VMA(3), /*int capsule*/ qfalse ); + return SV_EntityContact( VMA(1), VMA(2), VMA(3), TT_AABB ); case G_ENTITY_CONTACTCAPSULE: - return SV_EntityContact( VMA(1), VMA(2), VMA(3), /*int capsule*/ qtrue ); + return SV_EntityContact( VMA(1), VMA(2), VMA(3), TT_CAPSULE ); case G_TRACE: - SV_Trace( VMA(1), VMA(2), VMA(3), VMA(4), VMA(5), args[6], args[7], /*int capsule*/ qfalse ); + SV_Trace( VMA(1), VMA(2), VMA(3), VMA(4), VMA(5), args[6], args[7], TT_AABB ); return 0; case G_TRACECAPSULE: - SV_Trace( VMA(1), VMA(2), VMA(3), VMA(4), VMA(5), args[6], args[7], /*int capsule*/ qtrue ); + SV_Trace( VMA(1), VMA(2), VMA(3), VMA(4), VMA(5), args[6], args[7], TT_CAPSULE ); return 0; case G_POINT_CONTENTS: return SV_PointContents( VMA(1), args[2] ); |