diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2008-04-23 15:02:41 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2008-04-23 15:02:41 +0000 |
| commit | 49e6170b49fbb933eddec6d0e3f946320c68832f (patch) | |
| tree | 88d228d6f89103710074fdba041ce80584d5caa6 /source/cl_pred.c | |
| parent | 8c795585fb0c6c9178d9981f6943da04b7279205 (diff) | |
Added `dumpents' server command.
Added support for `cl_noskins' value of 2 (default all female
skins to `female/athena', all male skins to `male/grunt').
Renamed `scoreshot' command to `aashot', added `aadump' command.
Fixed several alignment issues on ARM architecture.
Server browser menu now indicates full and password protected
servers with color codes.
Implemented history search in console with Ctrl+R, Ctrl+S.
Removed `cl_railtrail_alpha' variable, all `cl_rail*_color' variables now
accept colors in #RRGGBBAA format.
Added `map_override' cvar (enables loading map entity lump from
external maps/*.ent file).
Made `quit' command accept extra arguments.
Made `draw' command accept arbitrary colors in #RRGGBBAA format.
Fixed debian packages.
Diffstat (limited to 'source/cl_pred.c')
| -rw-r--r-- | source/cl_pred.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source/cl_pred.c b/source/cl_pred.c index 36e4e9b..f79d3de 100644 --- a/source/cl_pred.c +++ b/source/cl_pred.c @@ -109,7 +109,6 @@ static void CL_ClipMoveToEntities ( vec3_t start, vec3_t mins, vec3_t maxs, vec3 int i, x, zd, zu; trace_t trace; cnode_t *headnode; - float *angles; entity_state_t *ent; cmodel_t *cmodel; vec3_t bmins, bmaxs; @@ -123,7 +122,6 @@ static void CL_ClipMoveToEntities ( vec3_t start, vec3_t mins, vec3_t maxs, vec3 if (!cmodel) continue; headnode = cmodel->headnode; - angles = ent->angles; } else { // encoded bbox x = 8*(ent->solid & 31); @@ -136,7 +134,6 @@ static void CL_ClipMoveToEntities ( vec3_t start, vec3_t mins, vec3_t maxs, vec3 bmaxs[2] = zu; headnode = CM_HeadnodeForBox (bmins, bmaxs); - angles = vec3_origin; // boxes don't rotate } if (tr->allsolid) @@ -144,18 +141,9 @@ static void CL_ClipMoveToEntities ( vec3_t start, vec3_t mins, vec3_t maxs, vec3 CM_TransformedBoxTrace (&trace, start, end, mins, maxs, headnode, MASK_PLAYERSOLID, - ent->origin, angles); - - tr->allsolid |= trace.allsolid; - tr->startsolid |= trace.startsolid; - if( trace.fraction < tr->fraction ) { - tr->fraction = trace.fraction; - VectorCopy( trace.endpos, tr->endpos ); - tr->plane = trace.plane; - tr->surface = trace.surface; - tr->contents |= trace.contents; - tr->ent = ( struct edict_s * )ent; - } + ent->origin, ent->angles); + + CM_ClipEntity( tr, &trace, ( struct edict_s * )ent ); } } |