Added temporary command sqlmenu to the client ...

... to make designing it easier.
This commit is contained in:
Walter Julius Hennecke 2012-12-20 00:35:30 +01:00
parent 8f345fbfde
commit 9101ad9a3b
5 changed files with 79 additions and 5 deletions

View file

@ -661,6 +661,10 @@ void CG_ToggleThirdPerson_f ( void ) {
trap_Cvar_Set( "cg_thirdPerson", va( "%i", value ) );
}
void CG_SqlMenu_f(void) {
trap_SendConsoleCommand("ui_sqlmenu");
}
/*================================================================================*/
typedef struct {
@ -726,6 +730,7 @@ static consoleCommand_t commands[] = {
{ "classList", CG_ClassList_cmd },
{ "emote", CG_Emote_f },
{ "locedit", CG_LocEdit_f },
{ "sqlmenu", CG_SqlMenu_f },
};

View file

@ -1334,6 +1334,11 @@ qboolean UI_ConsoleCommand( void ) {
return qtrue;
}
if ( Q_stricmp( cmd, "ui_sqlmenu") == 0) {
UI_sqlMenu();
return qtrue;
}
return qfalse;
}

View file

@ -1980,6 +1980,11 @@ extern void UI_VideoDataMenu_Cache(void);
extern void UI_VideoData2Menu_Cache(void);
extern void UI_VideoDriverMenu_Cache(void);
//
// ui_sql.c
//
extern void UI_sqlMenu(void);
//
// ui_players.c
//

View file

@ -49,14 +49,14 @@ int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int a
return UI_IsFullscreen();
case UI_SET_ACTIVE_MENU:
UI_SetActiveMenu( arg0 );
UI_SetActiveMenu( (uiMenuCommand_t)arg0 );
return 0;
case UI_CONSOLE_COMMAND:
return UI_ConsoleCommand();
case UI_DRAW_CONNECT_SCREEN:
UI_DrawConnectScreen( arg0 );
UI_DrawConnectScreen( (qboolean)arg0 );
return 0;
}

View file

@ -8,6 +8,8 @@
typedef struct {
menuframework_s menu;
menubitmap_s quitmenu;
menubitmap_s login;
char *username;
char *password;
@ -82,6 +84,19 @@ void UI_sqlMenu_Cache (void)
corner_ll_12_60 = trap_R_RegisterShaderNoMip("menu/common/corner_ll_12_60.tga");
}
/*
===============
sqlMenu_Draw
===============
*/
static void sqlMenu_Draw(void)
{
// Draw graphics particular to Main Menu
M_sqlMenu_Graphics();
Menu_Draw( &s_sql.menu );
}
/*
===============
msdMenu_Init
@ -89,7 +104,7 @@ msdMenu_Init
*/
void sqlMenu_Init(void)
{
/*s_sql.menu.nitems = 0;
s_sql.menu.nitems = 0;
s_sql.menu.draw = sqlMenu_Draw;
s_sql.menu.key = sqlMenu_Key;
s_sql.menu.wrapAround = qtrue;
@ -97,6 +112,8 @@ void sqlMenu_Init(void)
s_sql.menu.descY = MENU_DESC_Y;
s_sql.menu.titleX = MENU_TITLE_X;
s_sql.menu.titleY = MENU_TITLE_Y;
s_sql.menu.fullscreen = qfalse;
s_sql.menu.nobackground = qtrue;
s_sql.quitmenu.generic.type = MTYPE_BITMAP;
s_sql.quitmenu.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
@ -111,10 +128,52 @@ void sqlMenu_Init(void)
s_sql.quitmenu.color2 = CT_LTPURPLE1;
s_sql.quitmenu.textX = MENU_BUTTON_TEXT_X;
s_sql.quitmenu.textY = 12;
s_sql.quitmenu.textEnum = MBT_RETURNMENU;
s_sql.quitmenu.textEnum = MBT_QUIT;
s_sql.quitmenu.textcolor = CT_BLACK;
s_sql.quitmenu.textcolor2 = CT_WHITE;
s_sql.quitmenu.textStyle = UI_TINYFONT;
Menu_AddItem( &s_sql.menu, &s_sql.quitmenu );*/
s_sql.login.generic.type = MTYPE_BITMAP;
s_sql.login.generic.flags = QMF_HIGHLIGHT_IF_FOCUS;
s_sql.login.generic.x = 350;
s_sql.login.generic.y = 380;
s_sql.login.generic.name = GRAPHIC_BUTTONRIGHT;
s_sql.login.generic.id = ID_LOGIN;
s_sql.login.generic.callback = M_sql_Event;
s_sql.login.width = MENU_BUTTON_MED_WIDTH-20;
s_sql.login.height = PROP_BIG_HEIGHT;
s_sql.login.color = CT_DKPURPLE1;
s_sql.login.color2 = CT_LTPURPLE1;
s_sql.login.textX = MENU_BUTTON_TEXT_X;
s_sql.login.textY = 12;
s_sql.login.textEnum = MBT_ACCEPT;
s_sql.login.textcolor = CT_BLACK;
s_sql.login.textcolor2 = CT_WHITE;
s_sql.login.textStyle = UI_TINYFONT;
Menu_AddItem( &s_sql.menu, &s_sql.quitmenu );
Menu_AddItem( &s_sql.menu, &s_sql.login );
}
/*
===============
UI_sqlMenu
===============
*/
void UI_sqlMenu(void) {
memset( &s_sql, 0, sizeof( s_sql ) );
uis.menusp = 0;
ingameFlag = qtrue; // true when in game menu is in use
Mouse_Show();
UI_sqlMenu_Cache();
sqlMenu_Init();
UI_PushMenu( &s_sql.menu );
Menu_AdjustCursor( &s_sql.menu, 1 );
}