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/sv_world.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/sv_world.c')
| -rw-r--r-- | source/sv_world.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/source/sv_world.c b/source/sv_world.c index ca0a039..52c6b8b 100644 --- a/source/sv_world.c +++ b/source/sv_world.c @@ -113,7 +113,7 @@ void SV_ClearWorld( void ) { SV_CreateAreaNode( 0, cm->mins, cm->maxs ); } - /* make sure all entities are unlinked */ + // make sure all entities are unlinked for( i = 0; i < MAX_EDICTS; i++ ) { ent = EDICT_NUM( i ); ent->area.prev = ent->area.next = NULL; @@ -475,8 +475,7 @@ SV_ClipMoveToEntities ==================== */ -void SV_ClipMoveToEntities ( moveclip_t *clip ) -{ +static void SV_ClipMoveToEntities( moveclip_t *clip ) { int i, num; edict_t *touchlist[MAX_EDICTS], *touch; trace_t trace; @@ -515,16 +514,7 @@ void SV_ClipMoveToEntities ( moveclip_t *clip ) clip->mins, clip->maxs, headnode, clip->contentmask, touch->s.origin, touch->s.angles); - clip->trace->allsolid |= trace.allsolid; - clip->trace->startsolid |= trace.startsolid; - if( trace.fraction < clip->trace->fraction ) { - clip->trace->fraction = trace.fraction; - VectorCopy( trace.endpos, clip->trace->endpos ); - clip->trace->plane = trace.plane; - clip->trace->surface = trace.surface; - clip->trace->contents |= trace.contents; - clip->trace->ent = touch; - } + CM_ClipEntity( clip->trace, &trace, touch ); } } |