From 0bc45ea1af4d22841e1e28eee08420949351a2e9 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sat, 3 Mar 2012 21:58:14 +0100 Subject: [PATCH] implement menu while paused --- src/level.c | 6 +---- src/main.h | 2 ++ src/pause.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 64 insertions(+), 7 deletions(-) diff --git a/src/level.c b/src/level.c index 7ee6fe3..8ceefa4 100644 --- a/src/level.c +++ b/src/level.c @@ -55,11 +55,7 @@ void Level_Load(struct Game *game) { } int Level_Keydown(struct Game *game, ALLEGRO_EVENT *ev) { - if (ev->keyboard.keycode == ALLEGRO_KEY_ESCAPE) { - UnloadGameState(game); - game->loadstate = GAMESTATE_MENU; - LoadGameState(game); - } else if (ev->keyboard.keycode==ALLEGRO_KEY_P) { + if (ev->keyboard.keycode==ALLEGRO_KEY_ESCAPE) { game->level.music_pos = al_get_sample_instance_position(game->level.music); al_set_sample_instance_playing(game->level.music, false); game->gamestate = GAMESTATE_PAUSE; diff --git a/src/main.h b/src/main.h index 08c6ebb..29c4d59 100644 --- a/src/main.h +++ b/src/main.h @@ -83,6 +83,8 @@ struct Loading { /*! \brief Resources used by Pause state. */ struct Pause { ALLEGRO_BITMAP *bitmap; + int selected; + bool options; }; /*! \brief Resources used by About state. */ diff --git a/src/pause.c b/src/pause.c index c03e829..a2f6f9e 100644 --- a/src/pause.c +++ b/src/pause.c @@ -3,13 +3,43 @@ */ #include +#include "config.h" #include "pause.h" int Pause_Keydown(struct Game *game, ALLEGRO_EVENT *ev) { - if ((ev->keyboard.keycode == ALLEGRO_KEY_ESCAPE) || (ev->keyboard.keycode==ALLEGRO_KEY_P)) { + if ((ev->keyboard.keycode == ALLEGRO_KEY_ESCAPE) || ((ev->keyboard.keycode==ALLEGRO_KEY_ENTER) && (game->pause.options==0) && (game->pause.selected==0))) { al_destroy_bitmap(game->pause.bitmap); game->gamestate = game->loadstate; } + else if ((ev->keyboard.keycode==ALLEGRO_KEY_ENTER) && (game->pause.options==0) && (game->pause.selected==1)) { + UnloadGameState(game); + game->gamestate = GAMESTATE_LOADING; + game->loadstate = GAMESTATE_MAP; + } else if (ev->keyboard.keycode==ALLEGRO_KEY_UP) { + game->pause.selected--; + if (game->fx) al_play_sample(game->menu.click_sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_ONCE, NULL); + } else if (ev->keyboard.keycode==ALLEGRO_KEY_DOWN) { + game->pause.selected++; + if (game->fx) al_play_sample(game->menu.click_sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_ONCE, NULL); + } else if ((!game->pause.options) && (((ev->keyboard.keycode==ALLEGRO_KEY_ENTER) && (game->pause.selected==3)) || (ev->keyboard.keycode == ALLEGRO_KEY_ESCAPE))) { + if (game->fx) al_play_sample(game->menu.click_sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_ONCE, NULL); + return 1; + } else if (((ev->keyboard.keycode==ALLEGRO_KEY_ENTER) && (!game->pause.options) && (game->pause.selected==2)) || (((game->pause.options) && ((ev->keyboard.keycode == ALLEGRO_KEY_ESCAPE))) || (((ev->keyboard.keycode==ALLEGRO_KEY_ENTER) && (game->pause.selected==3))))) { + if (game->fx) al_play_sample(game->menu.click_sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_ONCE, NULL); + game->pause.options=!game->pause.options; + game->pause.selected=0; + PrintConsole(game, "options state changed %d", game->pause.options); + } else if ((game->pause.options) && (game->pause.selected==2)) { + al_stop_samples(); + if ((game->music) && (game->fx)) { game->music=0; SetConfigOption("[SuperDerpy]", "music", "0"); } + else if (game->fx) { game->music=1; game->fx=0; SetConfigOption("[SuperDerpy]", "music", "1"); SetConfigOption("[SuperDerpy]", "fx", "0"); } + else if (game->music) { game->music=0; SetConfigOption("[SuperDerpy]", "music", "0"); } + else { game->music=1; game->fx=1; SetConfigOption("[SuperDerpy]", "music", "1"); SetConfigOption("[SuperDerpy]", "fx", "1"); } + if (game->fx) al_play_sample(game->menu.click_sample, 1.0, 0.0, 1.0, ALLEGRO_PLAYMODE_ONCE, NULL); + //play_samples(game); + } + if (game->pause.selected==-1) game->pause.selected=3; + if (game->pause.selected==4) game->pause.selected=0; return 0; } @@ -24,15 +54,44 @@ void Pause_Load(struct Game* game) { al_clear_to_color(al_map_rgb(0,0,0)); al_set_target_bitmap(al_get_backbuffer(game->display)); al_draw_tinted_bitmap(fade,al_map_rgba_f(1,1,1,0.75),0,0,0); - al_draw_text_with_shadow(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.5, ALLEGRO_ALIGN_CENTRE,"Game paused!"); + //al_draw_text_with_shadow(game->font, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.5, ALLEGRO_ALIGN_CENTRE,"Game paused!"); game->pause.bitmap = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display)); al_set_target_bitmap(game->pause.bitmap); al_draw_bitmap(al_get_backbuffer(game->display), 0, 0, 0); al_set_target_bitmap(al_get_backbuffer(game->display)); + game->pause.selected=0; + game->pause.options=0; } void Pause_Draw(struct Game* game) { al_draw_bitmap(game->pause.bitmap, 0, 0, 0); + al_draw_text_with_shadow(game->menu.font_title, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.1, ALLEGRO_ALIGN_CENTRE, "Super Derpy"); + al_draw_text_with_shadow(game->menu.font_subtitle, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.275, ALLEGRO_ALIGN_CENTRE, "Game paused."); + + ALLEGRO_FONT *font; + char* text; + font = game->menu.font; if (game->pause.selected==0) font = game->menu.font_selected; + text = "Resume game"; if (game->pause.options) text="Control settings"; + al_draw_text_with_shadow(font, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.5, ALLEGRO_ALIGN_CENTRE, text); + font = game->menu.font; if (game->pause.selected==1) font = game->menu.font_selected; + text = "Return to map"; if (game->pause.options) text="Video settings"; + al_draw_text_with_shadow(font, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.6, ALLEGRO_ALIGN_CENTRE, text); + font = game->menu.font; if (game->pause.selected==2) font = game->menu.font_selected; + text = "Options"; if (game->pause.options) { + if ((game->music) && (game->fx)) + text="Sounds: all"; + else if (game->music) + text="Sounds: music only"; + else if (game->fx) + text="Sounds: fx only"; + else + text="Sounds: none"; + } + al_draw_text_with_shadow(font, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.7, ALLEGRO_ALIGN_CENTRE, text); + font = game->menu.font; if (game->pause.selected==3) font = game->menu.font_selected; + text = "Exit"; if (game->pause.options) text="Back"; + al_draw_text_with_shadow(font, al_map_rgb(255,255,255), al_get_display_width(game->display)*0.5, al_get_display_height(game->display)*0.8, ALLEGRO_ALIGN_CENTRE, text); + DrawConsole(game); }