diff options
| -rw-r--r-- | src/cgame/cg_draw.c | 5 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index ff9d2525..cf25dda4 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -2226,16 +2226,17 @@ static void CG_Draw2D( void ) { return; } + //TA: draw the lighting effects e.g. nvg + CG_DrawLighting(); + if( ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) || ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ) { CG_DrawSpectator(); CG_DrawCrosshair(); CG_DrawCrosshairNames(); - CG_DrawLighting(); } else { // don't draw any status if dead or the scoreboard is being explicitly shown if ( !cg.showScores && cg.snap->ps.stats[STAT_HEALTH] > 0 ) { - CG_DrawLighting(); CG_DrawStatusBar(); CG_DrawAmmoWarning(); CG_DrawCrosshair(); diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 01ae9552..fee26036 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -937,7 +937,8 @@ static void CG_RegisterClients( void ) { //CG_LoadingClient(cg.clientNum); //CG_NewClientInfo(cg.clientNum); - for (i=0 ; i<MAX_CLIENTS+MAX_PRECACHES; i++) { + //yeah ok its silly, but lets precache models before setting client defaults + for (i=MAX_CLIENTS+MAX_PRECACHES+1; i>=0; i--) { const char *clientInfo; if (cg.clientNum == i) { @@ -951,8 +952,8 @@ static void CG_RegisterClients( void ) { if( i < MAX_CLIENTS ) { - //CG_LoadingClient( i ); - //CG_NewClientInfo( i ); + CG_LoadingClient( i ); + CG_NewClientInfo( i ); } else { |