From e7b1488f7488959728f1abe305f34baca238521d Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Mon, 9 Mar 2009 17:46:56 +0000 Subject: [PATCH] =?UTF-8?q?Spielmode=20hard+=20ins=20Men=C3=BC=20gepackt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- src/client/menu/menu.c | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 61761cbc..c344fdb7 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ SDLCFLAGS = $(shell sdl-config --cflags) # Client CFLAGS_CLIENT = $(CFLAGS_BASE) -CFLAGS_CLIENT += -Werror +CFLAGS_CLIENT += -Werror -g # Dedicated Server CFLAGS_DEDICATED_SERVER = $(CFLAGS_BASE) diff --git a/src/client/menu/menu.c b/src/client/menu/menu.c index c5db2e3d..d4923073 100644 --- a/src/client/menu/menu.c +++ b/src/client/menu/menu.c @@ -1884,6 +1884,7 @@ static menuframework_s s_game_menu; static menuaction_s s_easy_game_action; static menuaction_s s_medium_game_action; static menuaction_s s_hard_game_action; +static menuaction_s s_hardp_game_action; static menuaction_s s_load_game_action; static menuaction_s s_save_game_action; static menuaction_s s_credits_action; @@ -1919,6 +1920,12 @@ static void HardGameFunc( void *data ) StartGame(); } +static void HardpGameFunc( void *data ) +{ + Cvar_ForceSet( "skill", "3" ); + StartGame(); +} + static void LoadGameFunc( void *unused ) { M_Menu_LoadGame_f (); @@ -1959,33 +1966,41 @@ void Game_MenuInit( void ) s_hard_game_action.generic.y = 20; s_hard_game_action.generic.name = "hard"; s_hard_game_action.generic.callback = HardGameFunc; - + + s_hardp_game_action.generic.type = MTYPE_ACTION; + s_hardp_game_action.generic.flags = QMF_LEFT_JUSTIFY; + s_hardp_game_action.generic.x = 0; + s_hardp_game_action.generic.y = 30; + s_hardp_game_action.generic.name = "hard+"; + s_hardp_game_action.generic.callback = HardpGameFunc; + s_blankline.generic.type = MTYPE_SEPARATOR; s_load_game_action.generic.type = MTYPE_ACTION; s_load_game_action.generic.flags = QMF_LEFT_JUSTIFY; s_load_game_action.generic.x = 0; - s_load_game_action.generic.y = 40; + s_load_game_action.generic.y = 50; s_load_game_action.generic.name = "load game"; s_load_game_action.generic.callback = LoadGameFunc; s_save_game_action.generic.type = MTYPE_ACTION; s_save_game_action.generic.flags = QMF_LEFT_JUSTIFY; s_save_game_action.generic.x = 0; - s_save_game_action.generic.y = 50; + s_save_game_action.generic.y = 60; s_save_game_action.generic.name = "save game"; s_save_game_action.generic.callback = SaveGameFunc; s_credits_action.generic.type = MTYPE_ACTION; s_credits_action.generic.flags = QMF_LEFT_JUSTIFY; s_credits_action.generic.x = 0; - s_credits_action.generic.y = 60; + s_credits_action.generic.y = 70; s_credits_action.generic.name = "credits"; s_credits_action.generic.callback = CreditsFunc; Menu_AddItem( &s_game_menu, ( void * ) &s_easy_game_action ); Menu_AddItem( &s_game_menu, ( void * ) &s_medium_game_action ); Menu_AddItem( &s_game_menu, ( void * ) &s_hard_game_action ); + Menu_AddItem( &s_game_menu, ( void * ) &s_hardp_game_action ); Menu_AddItem( &s_game_menu, ( void * ) &s_blankline ); Menu_AddItem( &s_game_menu, ( void * ) &s_load_game_action ); Menu_AddItem( &s_game_menu, ( void * ) &s_save_game_action );