diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2010-05-12 22:01:48 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2010-05-12 22:01:48 +0000 |
| commit | ded2011518636a7e7643946adeb40fa11ac6501c (patch) | |
| tree | 15b7c3ea2be94aba998fc612dc4738ba30e28d8e | |
| parent | c877967be5689e19ae50ef7e241535d0e7b83a59 (diff) | |
Don't clear lagometer when toggling console.
Added ‘scr_lag_max’ cvar for controlling lagometer scale.
| -rw-r--r-- | source/cl_parse.c | 1 | ||||
| -rw-r--r-- | source/cl_scrn.c | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/cl_parse.c b/source/cl_parse.c index e516631..fd82425 100644 --- a/source/cl_parse.c +++ b/source/cl_parse.c @@ -391,6 +391,7 @@ static void CL_SetActiveState( void ) { } SCR_EndLoadingPlaque (); // get rid of loading plaque + SCR_LagClear(); if( !cls.demo.playback ) { EXEC_TRIGGER( cl_beginmapcmd ); diff --git a/source/cl_scrn.c b/source/cl_scrn.c index 423d6e8..0087945 100644 --- a/source/cl_scrn.c +++ b/source/cl_scrn.c @@ -62,6 +62,7 @@ static cvar_t *scr_draw2d; static cvar_t *scr_lag_x; static cvar_t *scr_lag_y; static cvar_t *scr_lag_draw; +static cvar_t *scr_lag_max; static cvar_t *scr_alpha; static cvar_t *scr_demobar; @@ -464,8 +465,6 @@ LAGOMETER #define LAG_WIDTH 48 #define LAG_HEIGHT 48 -#define LAG_MAX 200 - #define LAG_CRIT_BIT ( 1 << 31 ) #define LAG_WARN_BIT ( 1 << 30 ) @@ -506,7 +505,7 @@ void SCR_LagSample( void ) { } static void draw_ping_graph( int x, int y ) { - int i, j, v, c; + int i, j, v, c, max = Cvar_ClampInteger( scr_lag_max, 16, 480 ); for( i = 0; i < LAG_WIDTH; i++ ) { j = lag.head - i - 1; @@ -525,7 +524,7 @@ static void draw_ping_graph( int x, int y ) { } v &= ~(LAG_WARN_BIT|LAG_CRIT_BIT); - v = v * LAG_HEIGHT / LAG_MAX; + v = v * LAG_HEIGHT / max; if( v > LAG_HEIGHT ) { v = LAG_HEIGHT; } @@ -1063,6 +1062,7 @@ void SCR_Init( void ) { scr_lag_x = Cvar_Get( "scr_lag_x", "-1", 0 ); scr_lag_y = Cvar_Get( "scr_lag_y", "-1", 0 ); scr_lag_draw = Cvar_Get( "scr_lag_draw", "0", 0 ); + scr_lag_max = Cvar_Get( "scr_lag_max", "200", 0 ); scr_alpha = Cvar_Get( "scr_alpha", "1", 0 ); #ifdef _DEBUG scr_showstats = Cvar_Get( "scr_showstats", "0", 0 ); @@ -1117,7 +1117,6 @@ SCR_EndLoadingPlaque void SCR_EndLoadingPlaque( void ) { cls.disable_screen = 0; Con_ClearNotify_f(); - SCR_LagClear(); #if USE_CHATHUD SCR_ClearChatHUD_f(); #endif |