diff options
| author | Tim Angus <tim@ngus.net> | 2007-10-01 14:52:21 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-10-01 14:52:21 +0000 |
| commit | e6513f95705560250f00f1ccc0707e01e318192f (patch) | |
| tree | e5722c16048785141228061e72ac9e67af0c2f2d /src/cgame | |
| parent | 939f7c21246459c44b5dbfd12549eb9a1707234c (diff) | |
* Fix to bug where crouching and moving wouldn't replenish stamina
* s/MASK_PLAYERSOLID & ~CONTENTS_BODY/MASK_DEADSOLID/
* When finding a player in the server browser, only list each server once
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_predict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c index 59a1641b..e167f0f8 100644 --- a/src/cgame/cg_predict.c +++ b/src/cgame/cg_predict.c @@ -583,12 +583,12 @@ void CG_PredictPlayerState( void ) cg_pmove.debugLevel = cg_debugMove.integer; if( cg_pmove.ps->pm_type == PM_DEAD ) - cg_pmove.tracemask = MASK_PLAYERSOLID & ~CONTENTS_BODY; + cg_pmove.tracemask = MASK_DEADSOLID; else cg_pmove.tracemask = MASK_PLAYERSOLID; if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR ) - cg_pmove.tracemask &= ~CONTENTS_BODY; // spectators can fly through bodies + cg_pmove.tracemask = MASK_DEADSOLID; // spectators can fly through bodies cg_pmove.noFootsteps = 0; |