diff options
Diffstat (limited to 'source/ui_main.c')
| -rw-r--r-- | source/ui_main.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/source/ui_main.c b/source/ui_main.c index f2259b3..aa355bf 100644 --- a/source/ui_main.c +++ b/source/ui_main.c @@ -30,7 +30,7 @@ MAIN MENU #define MAIN_ITEMS 4 -static const char names[MAIN_ITEMS][16] = { +static const char names[MAIN_ITEMS][8] = { "Servers", "Demos", "Options", @@ -40,17 +40,10 @@ static const char names[MAIN_ITEMS][16] = { typedef struct mainMenu_s { menuFrameWork_t menu; menuAction_t actions[MAIN_ITEMS]; - menuStatic_t banner; } mainMenu_t; static mainMenu_t m_main; -static void MainMenu_QuitAction( qboolean yes ) { - if( yes ) { - cmd.ExecuteText( EXEC_APPEND, "quit\n" ); - } -} - static int MainMenu_Callback( int id, int msg, int param ) { switch( msg ) { case QM_ACTIVATE: @@ -65,12 +58,15 @@ static int MainMenu_Callback( int id, int msg, int param ) { M_Menu_Options_f(); break; case 3: - M_Menu_Confirm_f( "Quit game? y/n", MainMenu_QuitAction ); + cmd.ExecuteText( EXEC_APPEND, "quit\n" ); break; } return QMS_IN; case QM_DESTROY: break; + case QM_SIZE: + Menu_Size( &m_main.menu ); + break; default: break; } @@ -80,36 +76,26 @@ static int MainMenu_Callback( int id, int msg, int param ) { static void MainMenu_Init( void ) { int i; - int x, y; - - x = uis.width / 2; - y = ( uis.height - MENU_SPACING * MAIN_ITEMS ) / 2; memset( &m_main, 0, sizeof( m_main ) ); m_main.menu.callback = MainMenu_Callback; + m_main.menu.banner = "Main Menu"; for( i = 0; i < MAIN_ITEMS; i++ ) { m_main.actions[i].generic.type = MTYPE_ACTION; m_main.actions[i].generic.id = i; m_main.actions[i].generic.name = names[i]; - m_main.actions[i].generic.x = x; - m_main.actions[i].generic.y = y; m_main.actions[i].generic.uiFlags = UI_CENTER; - y += MENU_SPACING; Menu_AddItem( &m_main.menu, &m_main.actions[i] ); } m_main.actions[0].generic.flags = QMF_HASFOCUS; - - UI_SetupDefaultBanner( &m_main.banner, "Main Menu" ); - - Menu_AddItem( &m_main.menu, (void *)&m_main.banner ); } - void M_Menu_Main_f( void ) { MainMenu_Init(); UI_PushMenu( &m_main.menu ); } + |