From 1882feaa858168a02ff43afe531864af7db0009e Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 18 Apr 2006 06:03:37 +0000 Subject: [PATCH] removed scr_conspeed, now always instantaneous console opening/closing git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6301 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_screen.c | 20 +------------------- menu.c | 3 --- screen.h | 1 - 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/cl_screen.c b/cl_screen.c index 99e29b96..9e8785a3 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -8,7 +8,6 @@ cvar_t scr_viewsize = {CVAR_SAVE, "viewsize","100", "how large the view should be, 110 disables inventory bar, 120 disables status bar"}; cvar_t scr_fov = {CVAR_SAVE, "fov","90", "field of vision, 1-170 degrees, default 90, some players use 110-130"}; // 1 - 170 -cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900", "speed of console open/close"}; // LordHavoc: quake used 300 cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1", "opacity of console background"}; cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "0.2", "brightness of console background (0 = black, 1 = image)"}; cvar_t scr_conforcewhiledisconnected = {0, "scr_conforcewhiledisconnected", "1", "forces fullscreen console while disconnected"}; @@ -352,23 +351,7 @@ void SCR_SetUpToDrawConsole (void) else conlines = 0; // none visible - if (scr_conspeed.value) - { - if (scr_con_current > conlines) - { - scr_con_current -= scr_conspeed.value*cl.realframetime; - if (scr_con_current < conlines) - scr_con_current = conlines; - } - else if (scr_con_current < conlines) - { - scr_con_current += scr_conspeed.value*cl.realframetime; - if (scr_con_current > conlines) - scr_con_current = conlines; - } - } - else - scr_con_current = conlines; + scr_con_current = conlines; } /* @@ -527,7 +510,6 @@ void CL_Screen_Init(void) { Cvar_RegisterVariable (&scr_fov); Cvar_RegisterVariable (&scr_viewsize); - Cvar_RegisterVariable (&scr_conspeed); Cvar_RegisterVariable (&scr_conalpha); Cvar_RegisterVariable (&scr_conbrightness); Cvar_RegisterVariable (&scr_conforcewhiledisconnected); diff --git a/menu.c b/menu.c index 46ca530d..19f63f67 100644 --- a/menu.c +++ b/menu.c @@ -1559,8 +1559,6 @@ static void M_Menu_Options_AdjustSliders (int dir) Cvar_SetValueQuick (&vid_conwidth, bound(320, vid_conwidth.value + dir * 64, 2048)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&vid_conheight, bound(240, vid_conheight.value + dir * 48, 1536)); - else if (options_cursor == optnum++) - Cvar_SetValueQuick (&scr_conspeed, bound(0, scr_conspeed.value + dir * 100, 1000)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&scr_conalpha, bound(0, scr_conalpha.value + dir * 0.2, 1)); else if (options_cursor == optnum++) @@ -1698,7 +1696,6 @@ static void M_Options_Draw (void) M_Options_PrintCommand( " Color Control", true); M_Options_PrintSlider( " 2D Screen Width ", true, vid_conwidth.value, 320, 2048); M_Options_PrintSlider( " 2D Screen Height", true, vid_conheight.value, 240, 1536); - M_Options_PrintSlider( " Console Speed", true, scr_conspeed.value, 0, 1000); M_Options_PrintSlider( " Console Alpha", true, scr_conalpha.value, 0, 1); M_Options_PrintSlider( "Conback Brightness", true, scr_conbrightness.value, 0, 1); M_Options_PrintSlider( " Sbar Alpha BG", true, sbar_alpha_bg.value, 0, 1); diff --git a/screen.h b/screen.h index b479bc45..dfdb4e56 100644 --- a/screen.h +++ b/screen.h @@ -42,7 +42,6 @@ extern cvar_t crosshair; extern cvar_t crosshair_size; extern cvar_t crosshair_static; -extern cvar_t scr_conspeed; extern cvar_t scr_conalpha; extern cvar_t scr_conbrightness; extern cvar_t r_letterbox; -- 2.39.2