diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2008-05-22 16:43:23 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2008-05-22 16:43:23 +0000 |
| commit | 15611ef841b9d60564daf250eaa59239e8fc631e (patch) | |
| tree | 3a6f0a8c4a440f9c806667a61b0b67ef475ec68d /source/cl_console.c | |
| parent | ea1ed930673bb4063bb210a6b1a34364a9093d77 (diff) | |
Cleaned up sound mixing code, removed assembly stubs.
Menu script enhancements (customizable colors).
Removed `ui_background' cvar (specified in script now).
Diffstat (limited to 'source/cl_console.c')
| -rw-r--r-- | source/cl_console.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source/cl_console.c b/source/cl_console.c index 659a5f9..7f6846e 100644 --- a/source/cl_console.c +++ b/source/cl_console.c @@ -63,7 +63,6 @@ typedef struct console_s { float currentHeight; // aproaches scr_conlines at scr_conspeed float destHeight; // 0.0 to 1.0 lines of console to display - float maxHeight; commandPrompt_t chatPrompt; commandPrompt_t prompt; @@ -415,7 +414,6 @@ void Con_Init( void ) { scr_glconfig.vidWidth = 640; scr_glconfig.vidHeight = 480; con.linewidth = -1; - con.maxHeight = 1; con.scale = 1; Con_CheckResize(); @@ -862,10 +860,6 @@ void Con_DrawSolidConsole( void ) { //============================================================================= -void Con_SetMaxHeight( float frac ) { - con.maxHeight = frac; -} - /* ================== Con_RunConsole @@ -874,20 +868,18 @@ Scroll it up or down ================== */ void Con_RunConsole( void ) { - Cvar_ClampValue( con_height, 0.1f, con.maxHeight ); + Cvar_ClampValue( con_height, 0.1f, 1 ); if( cls.state == ca_disconnected && !( cls.key_dest & KEY_MENU ) ) { // draw fullscreen console - con.destHeight = con.maxHeight; - con.currentHeight = con.destHeight; + con.destHeight = con.currentHeight = 1; return; } if( cls.state > ca_disconnected && cls.state < ca_active ) { #if 0 // draw half-screen console - con.destHeight = min( con.maxHeight, 0.5f ); - con.currentHeight = con.destHeight; + con.destHeight = con.currentHeight = 0.5f; return; #endif } |