diff --git a/src/h_interface.c b/src/h_interface.c index c91d4e4..679fa9b 100644 --- a/src/h_interface.c +++ b/src/h_interface.c @@ -131,7 +131,7 @@ char *story_unlock_name [UNLOCKS] = #define FIXED_STORY_BOX_X 20 -#define FIXED_STORY_BOX_Y 550 +#define FIXED_STORY_BOX_Y 610 #define STORY_BOX_W 390 #define STORY_BOX_H 110 @@ -441,6 +441,9 @@ void story_input(void) reset_log(); open_template(0, 0); // prevents a situation where the user has a player 1 template open then goes back to the story select screen + game.phase = GAME_PHASE_MENU; + reset_mode_buttons(); + // story_inter.region_selected = -1; return; @@ -488,7 +491,7 @@ static void reset_region_screen_positions(void) { story_inter.region_x_start = 150; - story_inter.region_y_start = 460; + story_inter.region_y_start = 540; int i; @@ -660,7 +663,7 @@ static void draw_story_regions(void) } float intro_text_x = 300; -float intro_text_y = 50; +float intro_text_y; #define INTRO_TEXT_LINE_H 15 #define INTRO_TEXT_LINE_H_2 32 @@ -755,6 +758,9 @@ float intro_text_y = 50; if (story.region[2].defeated && !story.region[3].defeated) { + + intro_text_y = 50; + al_draw_textf(font[FONT_SQUARE].fnt, colours.base [COL_GREY] [SHADE_MAX], intro_text_x, intro_text_y, ALLEGRO_ALIGN_CENTRE, "Defeating your first region has unlocked two new objects:"); @@ -810,6 +816,9 @@ float intro_text_y = 50; && !story.region[5].defeated // should be yellow or green 1 && !story.region[8].defeated) // other yellow or green 1 { + + intro_text_y = 20; + al_draw_textf(font[FONT_SQUARE].fnt, colours.base [COL_GREY] [SHADE_MAX], intro_text_x, intro_text_y, ALLEGRO_ALIGN_CENTRE, "Defeating your second region has unlocked"); diff --git a/src/h_story.c b/src/h_story.c index 7240147..7c0b9d7 100644 --- a/src/h_story.c +++ b/src/h_story.c @@ -426,6 +426,8 @@ static void remove_story_region(int region_index) // can call this any time a region is defeated, or during initialisation static void work_out_story_region_locks(void) { +// story.region[2].defeated = 1; +// story.region[3].defeated = 1; // story.region[0].defeated = 1; // story.region[1].defeated = 1; @@ -445,6 +447,7 @@ static void work_out_story_region_locks(void) for (i = 0; i < STORY_REGIONS; i ++) { +// story.region[i].defeated = 1; story.region[i].can_be_played = 0; @@ -481,6 +484,7 @@ static void work_out_story_region_locks(void) } + for (i = 0; i < STORY_REGIONS; i ++) { diff --git a/src/m_main.c b/src/m_main.c index c64296c..268b727 100644 --- a/src/m_main.c +++ b/src/m_main.c @@ -516,6 +516,11 @@ fpr("\nInitialising:"); //fpr("\n OpenGL %i", al_get_opengl_version()); fpr("\n display"); +if (settings.option [OPTION_WINDOW_W] == 1024 && settings.option [OPTION_WINDOW_H] == 768) +{ + fpr(" (Warning: 1024x768 resolution is playable, but higher is recommended.)"); +} + init_inter(); fpr("\n interface");