summaryrefslogtreecommitdiff
path: root/source/cl_console.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2008-05-18 14:37:21 +0000
committerAndrey Nazarov <skuller@skuller.net>2008-05-18 14:37:21 +0000
commitcb43ed08c3cf6410fe4ce22dac3d07952db92893 (patch)
tree0b2b2790941743db47913cdf06b819c36b89e161 /source/cl_console.c
parent179f701f7aec100ac1228fc02778fc4af47b75f0 (diff)
Accept `all' as special argument to `delstuffcmd' command.
Cleaned up Cvar_Get and fixed semantic bug. Accept `background keyword in menu scripts. Renamed `gl_fastsky' to `gl_drawsky'. If at least one of the sky env maps fails lo load, disable entire sky drawing. Reworked loading screen. Fixed Com_Quit argument string handling. Catch more signals on *nix. Updated server docs.
Diffstat (limited to 'source/cl_console.c')
-rw-r--r--source/cl_console.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/source/cl_console.c b/source/cl_console.c
index 5dd10bd..1417679 100644
--- a/source/cl_console.c
+++ b/source/cl_console.c
@@ -727,6 +727,11 @@ void Con_DrawSolidConsole( void ) {
ref.DrawStretchPic( 0, vislines - con.vidHeight,
con.vidWidth, con.vidHeight, con.backImage );
}
+#if 0
+ if( cls.state > ca_disconnected && cls.state < ca_active ) {
+ ref.DrawFill( 0, vislines, con.vidWidth, con.vidHeight - vislines, 0 );
+ }
+#endif
// draw the text
y = vislines - CON_PRESTEP;
@@ -842,12 +847,12 @@ void Con_DrawSolidConsole( void ) {
// draw clock
if( con_clock->integer ) {
Com_Time_m( buffer, sizeof( buffer ) );
- UIS_DrawStringEx( con.vidWidth - CHAR_WIDTH, y - CHAR_HEIGHT,
+ SCR_DrawStringEx( con.vidWidth - CHAR_WIDTH, y - CHAR_HEIGHT,
UI_RIGHT, MAX_STRING_CHARS, buffer, con.charsetImage );
}
// draw version
- UIS_DrawStringEx( con.vidWidth - CHAR_WIDTH, y, UI_RIGHT,
+ SCR_DrawStringEx( con.vidWidth - CHAR_WIDTH, y, UI_RIGHT,
MAX_STRING_CHARS, APPLICATION " " VERSION, con.charsetImage );
// restore rendering parameters
@@ -879,13 +884,11 @@ void Con_RunConsole( void ) {
}
if( cls.state > ca_disconnected && cls.state < ca_active ) {
-#if 0
- if( !cls.ui_initialized ) {
- // draw half-screen console
- con.destHeight = min( con.maxHeight, 0.5f );
- con.currentHeight = con.destHeight;
- return;
- }
+#if 1
+ // draw half-screen console
+ con.destHeight = min( con.maxHeight, 0.5f );
+ con.currentHeight = con.destHeight;
+ return;
#endif
}