Spielmode hard+ ins Menü gepackt

This commit is contained in:
Yamagi Burmeister 2009-03-09 17:46:56 +00:00
parent 5fd890afb4
commit e7b1488f74
2 changed files with 20 additions and 5 deletions

View file

@ -66,7 +66,7 @@ SDLCFLAGS = $(shell sdl-config --cflags)
# Client # Client
CFLAGS_CLIENT = $(CFLAGS_BASE) CFLAGS_CLIENT = $(CFLAGS_BASE)
CFLAGS_CLIENT += -Werror CFLAGS_CLIENT += -Werror -g
# Dedicated Server # Dedicated Server
CFLAGS_DEDICATED_SERVER = $(CFLAGS_BASE) CFLAGS_DEDICATED_SERVER = $(CFLAGS_BASE)

View file

@ -1884,6 +1884,7 @@ static menuframework_s s_game_menu;
static menuaction_s s_easy_game_action; static menuaction_s s_easy_game_action;
static menuaction_s s_medium_game_action; static menuaction_s s_medium_game_action;
static menuaction_s s_hard_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_load_game_action;
static menuaction_s s_save_game_action; static menuaction_s s_save_game_action;
static menuaction_s s_credits_action; static menuaction_s s_credits_action;
@ -1919,6 +1920,12 @@ static void HardGameFunc( void *data )
StartGame(); StartGame();
} }
static void HardpGameFunc( void *data )
{
Cvar_ForceSet( "skill", "3" );
StartGame();
}
static void LoadGameFunc( void *unused ) static void LoadGameFunc( void *unused )
{ {
M_Menu_LoadGame_f (); M_Menu_LoadGame_f ();
@ -1960,32 +1967,40 @@ void Game_MenuInit( void )
s_hard_game_action.generic.name = "hard"; s_hard_game_action.generic.name = "hard";
s_hard_game_action.generic.callback = HardGameFunc; 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_blankline.generic.type = MTYPE_SEPARATOR;
s_load_game_action.generic.type = MTYPE_ACTION; s_load_game_action.generic.type = MTYPE_ACTION;
s_load_game_action.generic.flags = QMF_LEFT_JUSTIFY; s_load_game_action.generic.flags = QMF_LEFT_JUSTIFY;
s_load_game_action.generic.x = 0; 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.name = "load game";
s_load_game_action.generic.callback = LoadGameFunc; s_load_game_action.generic.callback = LoadGameFunc;
s_save_game_action.generic.type = MTYPE_ACTION; s_save_game_action.generic.type = MTYPE_ACTION;
s_save_game_action.generic.flags = QMF_LEFT_JUSTIFY; s_save_game_action.generic.flags = QMF_LEFT_JUSTIFY;
s_save_game_action.generic.x = 0; 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.name = "save game";
s_save_game_action.generic.callback = SaveGameFunc; s_save_game_action.generic.callback = SaveGameFunc;
s_credits_action.generic.type = MTYPE_ACTION; s_credits_action.generic.type = MTYPE_ACTION;
s_credits_action.generic.flags = QMF_LEFT_JUSTIFY; s_credits_action.generic.flags = QMF_LEFT_JUSTIFY;
s_credits_action.generic.x = 0; 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.name = "credits";
s_credits_action.generic.callback = CreditsFunc; s_credits_action.generic.callback = CreditsFunc;
Menu_AddItem( &s_game_menu, ( void * ) &s_easy_game_action ); 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_medium_game_action );
Menu_AddItem( &s_game_menu, ( void * ) &s_hard_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_blankline );
Menu_AddItem( &s_game_menu, ( void * ) &s_load_game_action ); Menu_AddItem( &s_game_menu, ( void * ) &s_load_game_action );
Menu_AddItem( &s_game_menu, ( void * ) &s_save_game_action ); Menu_AddItem( &s_game_menu, ( void * ) &s_save_game_action );