summaryrefslogtreecommitdiff
path: root/source/ui_atoms.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2008-05-09 18:04:42 +0000
committerAndrey Nazarov <skuller@skuller.net>2008-05-09 18:04:42 +0000
commit026b51719172c865bc8fefe7ffd63cc79c74db1c (patch)
tree559947ebd3f8f0ba000bd72f927dc337430c38c6 /source/ui_atoms.c
parent89e431fa54b292ff1ebd5346c06e733cdb710bd9 (diff)
Autodetect gzipped demos during playback.
Extended menu scripts.
Diffstat (limited to 'source/ui_atoms.c')
-rw-r--r--source/ui_atoms.c594
1 files changed, 289 insertions, 305 deletions
diff --git a/source/ui_atoms.c b/source/ui_atoms.c
index b13ed83..13ca51d 100644
--- a/source/ui_atoms.c
+++ b/source/ui_atoms.c
@@ -20,14 +20,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "ui_local.h"
-uiStatic_t uis;
+uiStatic_t uis;
LIST_DECL( ui_menus );
-cvar_t *ui_debug;
-static cvar_t *ui_open;
-static cvar_t *ui_background;
-static cvar_t *ui_scale;
+cvar_t *ui_debug;
+static cvar_t *ui_open;
+static cvar_t *ui_background;
+static cvar_t *ui_scale;
// ===========================================================================
@@ -37,30 +37,30 @@ UI_PushMenu
=================
*/
void UI_PushMenu( menuFrameWork_t *menu ) {
- int i, j;
+ int i, j;
if( !menu ) {
return;
}
- // if this menu is already present, drop back to that level
- // to avoid stacking menus by hotkeys
- for( i = 0; i < uis.menuDepth; i++ ) {
- if( uis.layers[i] == menu ) {
- break;
- }
- }
+ // if this menu is already present, drop back to that level
+ // to avoid stacking menus by hotkeys
+ for( i = 0; i < uis.menuDepth; i++ ) {
+ if( uis.layers[i] == menu ) {
+ break;
+ }
+ }
- if( i == uis.menuDepth ) {
- if( uis.menuDepth >= MAX_MENU_DEPTH )
- Com_Error( ERR_FATAL, "UI_PushMenu: MAX_MENU_DEPTH" );
- uis.layers[uis.menuDepth++] = menu;
- } else {
+ if( i == uis.menuDepth ) {
+ if( uis.menuDepth >= MAX_MENU_DEPTH )
+ Com_Error( ERR_FATAL, "UI_PushMenu: MAX_MENU_DEPTH" );
+ uis.layers[uis.menuDepth++] = menu;
+ } else {
for( j = i; j < uis.menuDepth; j++ ) {
UI_PopMenu();
}
- uis.menuDepth = i + 1;
- }
+ uis.menuDepth = i + 1;
+ }
if( menu->push ) {
if( !menu->push( menu ) ) {
@@ -72,17 +72,17 @@ void UI_PushMenu( menuFrameWork_t *menu ) {
Con_Close();
- Key_SetDest( ( Key_GetDest() & ~KEY_CONSOLE ) | KEY_MENU );
+ Key_SetDest( ( Key_GetDest() & ~KEY_CONSOLE ) | KEY_MENU );
- if( !uis.activeMenu ) {
- uis.entersound = qtrue;
+ if( !uis.activeMenu ) {
+ uis.entersound = qtrue;
//CL_WarpMouse( 0, 0 );
- }
+ }
uis.transparent |= menu->transparent;
- uis.activeMenu = menu;
+ uis.activeMenu = menu;
- UI_DoHitTest();
+ UI_DoHitTest();
if( menu->expose ) {
menu->expose( menu );
@@ -90,7 +90,7 @@ void UI_PushMenu( menuFrameWork_t *menu ) {
}
void UI_Resize( void ) {
- int i;
+ int i;
if( uis.glconfig.renderer == GL_RENDERER_SOFTWARE ) {
uis.clipRect.left = 0;
@@ -107,9 +107,9 @@ void UI_Resize( void ) {
uis.height = uis.glconfig.vidHeight * uis.scale;
}
- for( i = 0; i < uis.menuDepth; i++ ) {
+ for( i = 0; i < uis.menuDepth; i++ ) {
Menu_Init( uis.layers[i] );
- }
+ }
//CL_WarpMouse( 0, 0 );
}
@@ -122,19 +122,19 @@ UI_ForceMenuOff
*/
void UI_ForceMenuOff( void ) {
menuFrameWork_t *menu;
- int i;
+ int i;
- for( i = 0; i < uis.menuDepth; i++ ) {
+ for( i = 0; i < uis.menuDepth; i++ ) {
menu = uis.layers[i];
if( menu->pop ) {
- menu->pop( menu );
- }
- }
-
- Key_SetDest( Key_GetDest() & ~KEY_MENU );
- uis.menuDepth = 0;
- uis.activeMenu = NULL;
- uis.transparent = qfalse;
+ menu->pop( menu );
+ }
+ }
+
+ Key_SetDest( Key_GetDest() & ~KEY_MENU );
+ uis.menuDepth = 0;
+ uis.activeMenu = NULL;
+ uis.transparent = qfalse;
}
/*
@@ -144,32 +144,32 @@ UI_PopMenu
*/
void UI_PopMenu( void ) {
menuFrameWork_t *menu;
- int i;
+ int i;
- if( uis.menuDepth < 1 )
- Com_Error( ERR_FATAL, "UI_PopMenu: depth < 1" );
+ if( uis.menuDepth < 1 )
+ Com_Error( ERR_FATAL, "UI_PopMenu: depth < 1" );
menu = uis.layers[--uis.menuDepth];
if( menu->pop ) {
menu->pop( menu );
}
- if( !uis.menuDepth ) {
- UI_ForceMenuOff();
- return;
- }
+ if( !uis.menuDepth ) {
+ UI_ForceMenuOff();
+ return;
+ }
- uis.activeMenu = uis.layers[uis.menuDepth - 1];
+ uis.activeMenu = uis.layers[uis.menuDepth - 1];
- uis.transparent = qfalse;
- for( i = uis.menuDepth - 1; i >= 0; i-- ) {
- if( uis.layers[i]->transparent ) {
- uis.transparent = qtrue;
- break;
- }
- }
+ uis.transparent = qfalse;
+ for( i = uis.menuDepth - 1; i >= 0; i-- ) {
+ if( uis.layers[i]->transparent ) {
+ uis.transparent = qtrue;
+ break;
+ }
+ }
- UI_DoHitTest();
+ UI_DoHitTest();
}
/*
@@ -178,15 +178,15 @@ UI_IsTransparent
=================
*/
qboolean UI_IsTransparent( void ) {
- if( !( Key_GetDest() & KEY_MENU ) ) {
- return qtrue;
- }
+ if( !( Key_GetDest() & KEY_MENU ) ) {
+ return qtrue;
+ }
- if( !uis.activeMenu ) {
- return qtrue;
- }
+ if( !uis.activeMenu ) {
+ return qtrue;
+ }
- return uis.transparent;
+ return uis.transparent;
}
menuFrameWork_t *UI_FindMenu( const char *name ) {
@@ -208,38 +208,38 @@ UI_OpenMenu
void UI_OpenMenu( uiMenu_t type ) {
menuFrameWork_t *menu = NULL;
- // close any existing menus
- UI_ForceMenuOff();
+ // close any existing menus
+ UI_ForceMenuOff();
- switch( type ) {
- case UIMENU_MAIN:
- if( ui_open->integer ) {
+ switch( type ) {
+ case UIMENU_MAIN:
+ if( ui_open->integer ) {
menu = UI_FindMenu( "main" );
- }
- break;
- case UIMENU_MAIN_FORCE:
+ }
+ break;
+ case UIMENU_MAIN_FORCE:
menu = UI_FindMenu( "main" );
- break;
- case UIMENU_INGAME:
+ break;
+ case UIMENU_INGAME:
menu = UI_FindMenu( "game" );
- break;
- case UIMENU_NONE:
- break;
- default:
- Com_Error( ERR_FATAL, "UI_OpenMenu: bad menu" );
- break;
- }
+ break;
+ case UIMENU_NONE:
+ break;
+ default:
+ Com_Error( ERR_FATAL, "UI_OpenMenu: bad menu" );
+ break;
+ }
UI_PushMenu( menu );
}
void UI_ErrorMenu( comErrorType_t type, const char *text ) {
- // close any existing menus
- UI_ForceMenuOff();
+ // close any existing menus
+ UI_ForceMenuOff();
- if( ui_open->integer ) {
+ if( ui_open->integer ) {
UI_PushMenu( UI_FindMenu( "main" ) );
- M_Menu_Error( type, text );
+ M_Menu_Error( type, text );
}
}
@@ -252,32 +252,32 @@ UI_FormatColumns
=================
*/
void *UI_FormatColumns( int extrasize, ... ) {
- va_list argptr;
- char *buffer, *p;
- int i, j;
- size_t total = 0;
- char *strings[MAX_COLUMNS];
- size_t lengths[MAX_COLUMNS];
-
- va_start( argptr, extrasize );
+ va_list argptr;
+ char *buffer, *p;
+ int i, j;
+ size_t total = 0;
+ char *strings[MAX_COLUMNS];
+ size_t lengths[MAX_COLUMNS];
+
+ va_start( argptr, extrasize );
for( i = 0; i < MAX_COLUMNS; i++ ) {
- if( ( p = va_arg( argptr, char * ) ) == NULL ) {
+ if( ( p = va_arg( argptr, char * ) ) == NULL ) {
break;
}
- strings[i] = p;
- total += lengths[i] = strlen( p ) + 1;
- }
- va_end( argptr );
+ strings[i] = p;
+ total += lengths[i] = strlen( p ) + 1;
+ }
+ va_end( argptr );
- buffer = UI_Malloc( extrasize + total + 1 );
+ buffer = UI_Malloc( extrasize + total + 1 );
p = buffer + extrasize;
- for( j = 0; j < i; j++ ) {
- memcpy( p, strings[j], lengths[j] );
- p += lengths[j];
- }
- *p = 0;
+ for( j = 0; j < i; j++ ) {
+ memcpy( p, strings[j], lengths[j] );
+ p += lengths[j];
+ }
+ *p = 0;
- return buffer;
+ return buffer;
}
char *UI_GetColumn( char *s, int n ) {
@@ -292,73 +292,55 @@ char *UI_GetColumn( char *s, int n ) {
/*
=================
-UI_CopyString
-=================
-*/
-char *UI_CopyString( const char *in ) {
- char *out;
-
- if( !in ) {
- return NULL;
- }
-
- out = UI_Malloc( strlen( in ) + 1 );
- strcpy( out, in );
-
- return out;
-}
-
-/*
-=================
UI_CursorInRect
=================
*/
qboolean UI_CursorInRect( vrect_t *rect ) {
- if( uis.mouseCoords[0] < rect->x ) {
+ if( uis.mouseCoords[0] < rect->x ) {
return qfalse;
}
- if( uis.mouseCoords[0] >= rect->x + rect->width ) {
+ if( uis.mouseCoords[0] >= rect->x + rect->width ) {
return qfalse;
}
- if( uis.mouseCoords[1] < rect->y ) {
+ if( uis.mouseCoords[1] < rect->y ) {
return qfalse;
}
if( uis.mouseCoords[1] >= rect->y + rect->height ) {
- return qfalse;
- }
- return qtrue;
+ return qfalse;
+ }
+ return qtrue;
}
void UI_DrawString( int x, int y, const color_t color, int flags, const char *string ) {
- if( color ) {
- ref.SetColor( DRAW_COLOR_RGBA, color );
- }
-
- if( ( flags & UI_CENTER ) == UI_CENTER ) {
- x -= Q_DrawStrlen( string ) * 8 / 2;
- } else if( flags & UI_RIGHT ) {
- x -= Q_DrawStrlen( string ) * 8;
- }
-
- ref.DrawString( x, y, flags, MAX_STRING_CHARS, string, uis.fontHandle );
- if( color ) {
- ref.SetColor( DRAW_COLOR_CLEAR, NULL );
- }
+ if( color ) {
+ ref.SetColor( DRAW_COLOR_RGBA, color );
+ }
+
+ if( ( flags & UI_CENTER ) == UI_CENTER ) {
+ x -= Q_DrawStrlen( string ) * 8 / 2;
+ } else if( flags & UI_RIGHT ) {
+ x -= Q_DrawStrlen( string ) * 8;
+ }
+
+ ref.DrawString( x, y, flags, MAX_STRING_CHARS, string, uis.fontHandle );
+ if( color ) {
+ ref.SetColor( DRAW_COLOR_CLEAR, NULL );
+ }
}
void UI_DrawChar( int x, int y, int flags, int ch ) {
- ref.DrawChar( x, y, flags, ch, uis.fontHandle );
+ ref.DrawChar( x, y, flags, ch, uis.fontHandle );
}
void UI_StringDimensions( vrect_t *rc, int flags, const char *string ) {
- rc->height = 8;
- rc->width = 8 * Q_DrawStrlen( string );
-
- if( ( flags & UI_CENTER ) == UI_CENTER ) {
- rc->x -= rc->width / 2;
- } else if( flags & UI_RIGHT ) {
- rc->x -= rc->width;
- }
+ rc->height = 8;
+ rc->width = 8 * Q_DrawStrlen( string );
+
+ if( ( flags & UI_CENTER ) == UI_CENTER ) {
+ rc->x -= rc->width / 2;
+ } else if( flags & UI_RIGHT ) {
+ rc->x -= rc->width;
+ }
}
@@ -373,28 +355,28 @@ UI_DoHitTest
=================
*/
qboolean UI_DoHitTest( void ) {
- menuCommon_t *item;
+ menuCommon_t *item;
- if( !uis.activeMenu ) {
- return qfalse;
- }
+ if( !uis.activeMenu ) {
+ return qfalse;
+ }
- if( !( item = Menu_HitTest( uis.activeMenu ) ) ) {
- return qfalse;
- }
- if( !UI_IsItemSelectable( item ) ) {
- return qfalse;
- }
+ if( !( item = Menu_HitTest( uis.activeMenu ) ) ) {
+ return qfalse;
+ }
+ if( !UI_IsItemSelectable( item ) ) {
+ return qfalse;
+ }
- Menu_MouseMove( item );
+ Menu_MouseMove( item );
- if( item->flags & QMF_HASFOCUS ) {
- return qfalse;
- }
+ if( item->flags & QMF_HASFOCUS ) {
+ return qfalse;
+ }
- Menu_SetFocus( item );
-
- return qtrue;
+ Menu_SetFocus( item );
+
+ return qtrue;
}
/*
@@ -403,17 +385,17 @@ UI_MouseEvent
=================
*/
void UI_MouseEvent( int x, int y ) {
- if( !uis.activeMenu ) {
- return;
- }
+ if( !uis.activeMenu ) {
+ return;
+ }
- clamp( x, 0, uis.glconfig.vidWidth );
- clamp( y, 0, uis.glconfig.vidHeight );
+ clamp( x, 0, uis.glconfig.vidWidth );
+ clamp( y, 0, uis.glconfig.vidHeight );
- uis.mouseCoords[0] = x * uis.scale;
- uis.mouseCoords[1] = y * uis.scale;
+ uis.mouseCoords[0] = x * uis.scale;
+ uis.mouseCoords[1] = y * uis.scale;
- UI_DoHitTest();
+ UI_DoHitTest();
}
/*
@@ -422,85 +404,85 @@ UI_Draw
=================
*/
void UI_Draw( int realtime ) {
- int i;
+ int i;
- uis.realtime = realtime;
+ uis.realtime = realtime;
- if( !( Key_GetDest() & KEY_MENU ) ) {
- return;
- }
+ if( !( Key_GetDest() & KEY_MENU ) ) {
+ return;
+ }
- if( !uis.activeMenu ) {
- return;
- }
+ if( !uis.activeMenu ) {
+ return;
+ }
- ref.SetColor( DRAW_COLOR_CLEAR, NULL );
+ ref.SetColor( DRAW_COLOR_CLEAR, NULL );
if( uis.glconfig.renderer == GL_RENDERER_SOFTWARE ) {
ref.SetClipRect( DRAW_CLIP_MASK, &uis.clipRect );
} else {
- ref.SetScale( &uis.scale );
- }
-
- if( !uis.transparent ) {
- // no transparent menus
- if( uis.backgroundHandle ) {
- ref.DrawStretchPic( 0, 0, uis.width, uis.height,
- uis.backgroundHandle );
- } else {
- ref.DrawFill( 0, 0, uis.width, uis.height, 0 );
- }
-
- if( uis.activeMenu->draw ) {
- uis.activeMenu->draw( uis.activeMenu );
- } else {
- Menu_Draw( uis.activeMenu );
- }
- } else {
- // draw all layers
- for( i = 0; i < uis.menuDepth; i++ ) {
- if( !uis.layers[i]->transparent ) {
- if( uis.backgroundHandle ) {
- ref.DrawStretchPic( 0, 0, uis.width, uis.height,
- uis.backgroundHandle );
- } else {
- ref.DrawFill( 0, 0, uis.width, uis.height, 0 );
- }
- }
-
- if( uis.layers[i]->draw ) {
- uis.layers[i]->draw( uis.layers[i] );
- } else {
- Menu_Draw( uis.layers[i] );
- }
- }
- }
+ ref.SetScale( &uis.scale );
+ }
+
+ if( !uis.transparent ) {
+ // no transparent menus
+ if( uis.backgroundHandle ) {
+ ref.DrawStretchPic( 0, 0, uis.width, uis.height,
+ uis.backgroundHandle );
+ } else {
+ ref.DrawFill( 0, 0, uis.width, uis.height, 0 );
+ }
+
+ if( uis.activeMenu->draw ) {
+ uis.activeMenu->draw( uis.activeMenu );
+ } else {
+ Menu_Draw( uis.activeMenu );
+ }
+ } else {
+ // draw all layers
+ for( i = 0; i < uis.menuDepth; i++ ) {
+ if( !uis.layers[i]->transparent ) {
+ if( uis.backgroundHandle ) {
+ ref.DrawStretchPic( 0, 0, uis.width, uis.height,
+ uis.backgroundHandle );
+ } else {
+ ref.DrawFill( 0, 0, uis.width, uis.height, 0 );
+ }
+ }
+
+ if( uis.layers[i]->draw ) {
+ uis.layers[i]->draw( uis.layers[i] );
+ } else {
+ Menu_Draw( uis.layers[i] );
+ }
+ }
+ }
// draw custom cursor in fullscreen mode
if( uis.glconfig.flags & QVF_FULLSCREEN ) {
- ref.DrawPic( uis.mouseCoords[0] - uis.cursorWidth / 2,
- uis.mouseCoords[1] - uis.cursorHeight / 2, uis.cursorHandle );
+ ref.DrawPic( uis.mouseCoords[0] - uis.cursorWidth / 2,
+ uis.mouseCoords[1] - uis.cursorHeight / 2, uis.cursorHandle );
}
- if( ui_debug->integer ) {
- Menu_HitTest( uis.activeMenu );
- UI_DrawString( uis.width - 4, 4, NULL, UI_RIGHT,
- va( "%3i %3i", uis.mouseCoords[0], uis.mouseCoords[1] ) );
- }
+ if( ui_debug->integer ) {
+ Menu_HitTest( uis.activeMenu );
+ UI_DrawString( uis.width - 4, 4, NULL, UI_RIGHT,
+ va( "%3i %3i", uis.mouseCoords[0], uis.mouseCoords[1] ) );
+ }
- // delay playing the enter sound until after the
- // menu has been drawn, to avoid delay while
- // caching images
- if( uis.entersound ) {
- uis.entersound = qfalse;
- S_StartLocalSound( "misc/menu1.wav" );
- }
+ // delay playing the enter sound until after the
+ // menu has been drawn, to avoid delay while
+ // caching images
+ if( uis.entersound ) {
+ uis.entersound = qfalse;
+ S_StartLocalSound( "misc/menu1.wav" );
+ }
if( uis.glconfig.renderer == GL_RENDERER_SOFTWARE ) {
ref.SetClipRect( DRAW_CLIP_DISABLED, NULL );
} else {
- ref.SetScale( NULL );
+ ref.SetScale( NULL );
}
- ref.SetColor( DRAW_COLOR_CLEAR, NULL );
+ ref.SetColor( DRAW_COLOR_CLEAR, NULL );
}
/*
@@ -509,30 +491,30 @@ UI_Keydown
=================
*/
void UI_Keydown( int key ) {
- menuSound_t sound;
+ menuSound_t sound;
- if( !uis.activeMenu ) {
- return;
- }
+ if( !uis.activeMenu ) {
+ return;
+ }
sound = Menu_Keydown( uis.activeMenu, key );
- switch( sound ) {
- case QMS_IN:
- S_StartLocalSound( "misc/menu1.wav" );
- break;
- case QMS_MOVE:
- S_StartLocalSound( "misc/menu2.wav" );
- break;
- case QMS_OUT:
- S_StartLocalSound( "misc/menu3.wav" );
- break;
- case QMS_BEEP:
- S_StartLocalSound( "misc/talk1.wav" );
- break;
- default:
- break;
- }
+ switch( sound ) {
+ case QMS_IN:
+ S_StartLocalSound( "misc/menu1.wav" );
+ break;
+ case QMS_MOVE:
+ S_StartLocalSound( "misc/menu2.wav" );
+ break;
+ case QMS_OUT:
+ S_StartLocalSound( "misc/menu3.wav" );
+ break;
+ case QMS_BEEP:
+ S_StartLocalSound( "misc/talk1.wav" );
+ break;
+ default:
+ break;
+ }
}
@@ -542,12 +524,12 @@ UI_CharEvent
=================
*/
void UI_CharEvent( int key ) {
- menuCommon_t *item;
- menuSound_t sound;
+ menuCommon_t *item;
+ menuSound_t sound;
- if( !uis.activeMenu ) {
- return;
- }
+ if( !uis.activeMenu ) {
+ return;
+ }
if( ( item = Menu_ItemAtCursor( uis.activeMenu ) ) == NULL ||
( sound = Menu_CharEvent( item, key ) ) == QMS_NOTHANDLED )
@@ -555,23 +537,23 @@ void UI_CharEvent( int key ) {
return;
}
- switch( sound ) {
- case QMS_IN:
- S_StartLocalSound( "misc/menu1.wav" );
- break;
- case QMS_MOVE:
- S_StartLocalSound( "misc/menu2.wav" );
- break;
- case QMS_OUT:
- S_StartLocalSound( "misc/menu3.wav" );
- break;
- case QMS_BEEP:
- S_StartLocalSound( "misc/talk1.wav" );
- break;
- case QMS_NOTHANDLED:
- default:
- break;
- }
+ switch( sound ) {
+ case QMS_IN:
+ S_StartLocalSound( "misc/menu1.wav" );
+ break;
+ case QMS_MOVE:
+ S_StartLocalSound( "misc/menu2.wav" );
+ break;
+ case QMS_OUT:
+ S_StartLocalSound( "misc/menu3.wav" );
+ break;
+ case QMS_BEEP:
+ S_StartLocalSound( "misc/talk1.wav" );
+ break;
+ case QMS_NOTHANDLED:
+ default:
+ break;
+ }
}
@@ -616,17 +598,17 @@ static void UI_PopMenu_f( void ) {
static const cmdreg_t c_ui[] = {
- { "forcemenuoff", UI_ForceMenuOff },
- { "pushmenu", UI_PushMenu_f, UI_PushMenu_c },
- { "popmenu", UI_PopMenu_f },
+ { "forcemenuoff", UI_ForceMenuOff },
+ { "pushmenu", UI_PushMenu_f, UI_PushMenu_c },
+ { "popmenu", UI_PopMenu_f },
- { NULL, NULL }
+ { NULL, NULL }
};
static void ui_background_changed( cvar_t *self ) {
- if( self->string[0] ) {
- uis.backgroundHandle = ref.RegisterPic( self->string );
- } else {
+ if( self->string[0] ) {
+ uis.backgroundHandle = ref.RegisterPic( self->string );
+ } else {
uis.backgroundHandle = 0;
}
}
@@ -636,9 +618,9 @@ static void ui_scale_changed( cvar_t *self ) {
}
void UI_ModeChanged( void ) {
- ui_scale = cvar.Get( "ui_scale", "1", 0 );
+ ui_scale = cvar.Get( "ui_scale", "1", 0 );
ui_scale->changed = ui_scale_changed;
- ref.GetConfig( &uis.glconfig );
+ ref.GetConfig( &uis.glconfig );
UI_Resize();
}
@@ -662,25 +644,25 @@ UI_Init
qboolean UI_Init( void ) {
Cmd_Register( c_ui );
- ui_debug = cvar.Get( "ui_debug", "0", 0 );
- ui_open = cvar.Get( "ui_open", "0", CVAR_ARCHIVE );
- ui_background = cvar.Get( "ui_background", "", 0 );
+ ui_debug = cvar.Get( "ui_debug", "0", 0 );
+ ui_open = cvar.Get( "ui_open", "0", CVAR_ARCHIVE );
+ ui_background = cvar.Get( "ui_background", "", 0 );
UI_ModeChanged();
- uis.fontHandle = ref.RegisterFont( "conchars" );
- uis.cursorHandle = ref.RegisterPic( "ch1" );
- ref.DrawGetPicSize( &uis.cursorWidth, &uis.cursorHeight, uis.cursorHandle );
+ uis.fontHandle = ref.RegisterFont( "conchars" );
+ uis.cursorHandle = ref.RegisterPic( "ch1" );
+ ref.DrawGetPicSize( &uis.cursorWidth, &uis.cursorHeight, uis.cursorHandle );
- if( uis.glconfig.renderer != GL_RENDERER_SOFTWARE ) {
- if( ui_background->string[0] ) {
- uis.backgroundHandle = ref.RegisterPic( ui_background->string );
- }
- ui_background->changed = ui_background_changed;
+ if( uis.glconfig.renderer != GL_RENDERER_SOFTWARE ) {
+ if( ui_background->string[0] ) {
+ uis.backgroundHandle = ref.RegisterPic( ui_background->string );
+ }
+ ui_background->changed = ui_background_changed;
}
- // Point to a nice location at startup
- strcpy( uis.m_demos_browse, "/demos" );
+ // Point to a nice location at startup
+ strcpy( uis.m_demos_browse, "/demos" );
// load built-in menus
M_Menu_PlayerConfig();
@@ -690,7 +672,9 @@ qboolean UI_Init( void ) {
// load custom menus
UI_LoadStript();
- return qtrue;
+ Com_Printf( "Registered %d menus.\n", List_Count( &ui_menus ) );
+
+ return qtrue;
}
/*
@@ -701,18 +685,18 @@ UI_Shutdown
void UI_Shutdown( void ) {
UI_ForceMenuOff();
- ui_background->changed = NULL;
+ ui_background->changed = NULL;
ui_scale->changed = NULL;
- PlayerModel_Free();
+ PlayerModel_Free();
UI_FreeMenus();
Cmd_Deregister( c_ui );
- memset( &uis, 0, sizeof( uis ) );
+ memset( &uis, 0, sizeof( uis ) );
- Z_LeakTest( TAG_UI );
+ Z_LeakTest( TAG_UI );
}