diff options
| author | Tim Angus <tim@ngus.net> | 2002-11-18 00:35:19 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2002-11-18 00:35:19 +0000 |
| commit | 9dca3a7130216e8dc90f5a9e2d95153bbfecd7a4 (patch) | |
| tree | 2baebdb086b4cb91167553c9da27dff6d5cac047 /src/cgame | |
| parent | b8db650b9abef5bc2a805fbb902f91a996bc31c0 (diff) | |
* Tweakage of values
* Sorted out hud selection code
* Wall walk smoothes now performed in the correct order (d'oh)
* Fixed bug involving human credit
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_view.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index cb37b8ac..500beb00 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -2190,8 +2190,6 @@ static void CG_Draw2D( void ) //TA: draw the lighting effects e.g. nvg CG_DrawLighting( ); - if( cg.predictedPlayerState.stats[ STAT_PTEAM ] != PTE_NONE ) - menu = Menus_FindByName( BG_FindHudNameForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ] ) ); defaultMenu = Menus_FindByName( "default_hud" ); @@ -2200,6 +2198,8 @@ static void CG_Draw2D( void ) w = CG_Text_Width( SPECTATOR_STRING, 0.7f, 0 ); CG_Text_Paint( 320 - w / 2, 440, 0.7f, color, SPECTATOR_STRING, 0, 0, ITEM_TEXTSTYLE_SHADOWED ); } + else + menu = Menus_FindByName( BG_FindHudNameForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ] ) ); if( !( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) && !( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) && menu ) diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c index 89f25029..3e56c91d 100644 --- a/src/cgame/cg_view.c +++ b/src/cgame/cg_view.c @@ -1079,7 +1079,7 @@ static void CG_smoothWWTransitions( playerState_t *ps, const vec3_t in, vec3_t o } //iterate through ops - for( i = 0; i < MAXSMOOTHS; i++ ) + for( i = MAXSMOOTHS - 1; i >= 0; i-- ) { //if this op has time remaining, perform it if( cg.time < cg.sList[ i ].time + cg_wwSmoothTime.integer ) |