X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=97b32f42ef5891a96c93fb4c63a2e049e7cbfcae;hb=e77c26313b1a1e3ddd884cdda005cb6758c1a100;hp=a1126a7992b0b0f43c8ccfa4f4f2d0d99ef0f80b;hpb=5c94351c5b8a12d8615b447b6275dd2f68615be4;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index a1126a79..97b32f42 100644 --- a/src/screens.c +++ b/src/screens.c @@ -35,13 +35,14 @@ #define SETUP_MODE_SHORTCUT_2 6 #define SETUP_MODE_GRAPHICS 7 #define SETUP_MODE_CHOOSE_SCREEN_MODE 8 -#define SETUP_MODE_SOUND 9 -#define SETUP_MODE_ARTWORK 10 -#define SETUP_MODE_CHOOSE_GRAPHICS 11 -#define SETUP_MODE_CHOOSE_SOUNDS 12 -#define SETUP_MODE_CHOOSE_MUSIC 13 +#define SETUP_MODE_CHOOSE_SCROLL_DELAY 9 +#define SETUP_MODE_SOUND 10 +#define SETUP_MODE_ARTWORK 11 +#define SETUP_MODE_CHOOSE_GRAPHICS 12 +#define SETUP_MODE_CHOOSE_SOUNDS 13 +#define SETUP_MODE_CHOOSE_MUSIC 14 -#define MAX_SETUP_MODES 14 +#define MAX_SETUP_MODES 15 /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -170,6 +171,9 @@ static int info_mode = INFO_MODE_MAIN; static TreeInfo *screen_modes = NULL; static TreeInfo *screen_mode_current = NULL; +static TreeInfo *scroll_delays = NULL; +static TreeInfo *scroll_delay_current = NULL; + static TreeInfo *game_speeds = NULL; static TreeInfo *game_speed_current = NULL; @@ -204,6 +208,25 @@ static struct { -1, NULL }, }; +static struct +{ + int value; + char *text; +} scroll_delays_list[] = +{ + { 0, "0 Tiles (No Scroll Delay)" }, + { 1, "1 Tile" }, + { 2, "2 Tiles" }, + { 3, "3 Tiles (Default)" }, + { 4, "4 Tiles" }, + { 5, "5 Tiles" }, + { 6, "6 Tiles" }, + { 7, "7 Tiles" }, + { 8, "8 Tiles (Maximum Scroll Delay)"}, + + { -1, NULL }, +}; + #define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \ (s) <= GAME_MODE_SETUP ? (s) : \ (s) == GAME_MODE_PSEUDO_TYPENAME ? \ @@ -735,9 +758,13 @@ static void InitializeMainControls() /* set main control text values to dynamically determined values */ sprintf(main_text_name, "%s", local_team_mode ? "Team:" : "Name:"); - sprintf(main_text_first_level, "%03d", leveldir_current->first_level); - sprintf(main_text_last_level, "%03d", leveldir_current->last_level); - sprintf(main_text_level_number, "%s", int2str(level_nr, 3)); + + strcpy(main_text_first_level, int2str(leveldir_current->first_level, + menu.main.text.first_level.size)); + strcpy(main_text_last_level, int2str(leveldir_current->last_level, + menu.main.text.last_level.size)); + strcpy(main_text_level_number, int2str(level_nr, + menu.main.text.level_number.size)); main_text_level_year = leveldir_current->year; main_text_level_imported_from = leveldir_current->imported_from; @@ -1230,11 +1257,28 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) title = title_default; #endif +#if 0 + { + int graphicA = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + int graphicB = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_PANEL]; + int graphic1 = element_info[EL_CONVEYOR_BELT_1_MIDDLE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + int graphic2 = element_info[EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + + printf("::: %d [%d] -> %d, %d [%d, %d]\n", + graphicA, graphicB, + graphic_info[graphicA].src_x, + graphic_info[graphicA].src_y, + graphic1, graphic2); + } +#endif + #if 0 printf("::: %d, %d\n", fading.anim_mode == ANIM_CROSSFADE, redraw_mask == REDRAW_ALL); #endif + FadeSetLeaveScreen(); + #if 1 FadeOut(redraw_mask); #endif @@ -1459,6 +1503,20 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) } #endif +#if 0 + { + game_status = GAME_MODE_PSEUDO_PREVIEW; + + DrawText(20, 400, "text_3.PREVIEW", FONT_TEXT_3); + DrawText(20, 420, "text_4.PREVIEW", FONT_TEXT_4); + + game_status = GAME_MODE_MAIN; + + DrawText(20, 440, "text_3.MAIN", FONT_TEXT_3); + DrawText(20, 460, "text_4.MAIN", FONT_TEXT_4); + } +#endif + #if 1 FadeIn(redraw_mask); #else @@ -1546,6 +1604,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) #endif #endif struct TitleControlInfo *tci; + struct TitleFadingInfo fading_default; struct TitleFadingInfo fading_last = fading; struct TitleFadingInfo fading_next; int sound, music; @@ -1579,9 +1638,11 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) DrawInfoScreen_NotAvailable("Title screen information:", "No title screen for this level set."); +#if 0 /* use default settings for fading, but always disable auto delay */ fading = title_default; fading.auto_delay = -1; +#endif return; } @@ -1598,11 +1659,24 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) else DrawTitleScreenMessage(tci->local_nr, tci->initial); + fading_default = (tci->initial ? title_initial_default : title_default); + fading = fading_next = getTitleFading(tci); +#if 1 +#if 1 + if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) && + fading_next.fade_mode & FADE_TYPE_TRANSFORM) + { + fading.fade_mode = FADE_MODE_FADE; + fading.fade_delay = fading_default.fade_delay; + } +#else if (fading_last.fade_mode != FADE_MODE_CROSSFADE && fading_next.fade_mode == FADE_MODE_CROSSFADE) fading.fade_mode = FADE_MODE_FADE; +#endif +#endif #if 1 sound = getTitleSound(tci); @@ -1619,6 +1693,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) SetMouseCursor(CURSOR_NONE); + // printf("::: mode: %d, delay: %d\n", fading.fade_mode, fading.fade_delay); + #if 1 FadeIn(REDRAW_ALL); #endif @@ -1630,8 +1706,13 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) return; } +#if 1 + if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay)) + button = MB_MENU_CHOICE; +#else if (fading.auto_delay > -1 && DelayReached(&title_delay, fading.auto_delay)) button = MB_MENU_CHOICE; +#endif if (button == MB_MENU_LEAVE) { @@ -1650,7 +1731,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) FadeOut(REDRAW_FIELD); #endif - FadeSetStartItem(); + FadeSetEnterScreen(); info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -1718,10 +1799,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) printf("::: %d -> %d\n", fading.fade_mode, fading_next.fade_mode); #endif +#if 1 + /* last screen already faded out, next screen has no animation */ + if (!(fading.fade_mode & FADE_TYPE_TRANSFORM) && + fading_next.fade_mode == FADE_MODE_NONE) + fading = fading_next; +#else /* last screen already faded out, next screen has no animation */ if (fading.fade_mode != FADE_MODE_CROSSFADE && fading_next.fade_mode == FADE_MODE_NONE) fading = fading_next; +#endif #if 1 FadeIn(REDRAW_ALL); @@ -1818,7 +1906,8 @@ void HandleMainMenu_SelectLevel(int step, int direction) #if 1 DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y, - int2str(level_nr, 3), mci->pos_text->font); + int2str(level_nr, menu.main.text.level_number.size), + mci->pos_text->font); #else DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); #endif @@ -1934,7 +2023,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) game_status = GAME_MODE_EDITOR; - FadeSetStartItem(); + FadeSetEnterScreen(); DrawLevelEd(); } @@ -2111,7 +2200,7 @@ static int num_info_info; static void execInfoTitleScreen() { #if 0 - FadeSetStartItem(); + FadeSetEnterScreen(); #endif info_mode = INFO_MODE_TITLE; @@ -2121,7 +2210,7 @@ static void execInfoTitleScreen() static void execInfoElements() { #if 0 - FadeSetStartItem(); + FadeSetEnterScreen(); #endif info_mode = INFO_MODE_ELEMENTS; @@ -2131,7 +2220,7 @@ static void execInfoElements() static void execInfoMusic() { #if 0 - FadeSetStartItem(); + FadeSetEnterScreen(); #endif info_mode = INFO_MODE_MUSIC; @@ -2141,7 +2230,7 @@ static void execInfoMusic() static void execInfoCredits() { #if 0 - FadeSetStartItem(); + FadeSetEnterScreen(); #endif info_mode = INFO_MODE_CREDITS; @@ -2151,7 +2240,7 @@ static void execInfoCredits() static void execInfoProgram() { #if 0 - FadeSetStartItem(); + FadeSetEnterScreen(); #endif info_mode = INFO_MODE_PROGRAM; @@ -2161,7 +2250,7 @@ static void execInfoProgram() static void execInfoVersion() { #if 0 - FadeSetStartItem(); + FadeSetEnterScreen(); #endif info_mode = INFO_MODE_VERSION; @@ -2171,7 +2260,7 @@ static void execInfoVersion() static void execInfoLevelSet() { #if 0 - FadeSetStartItem(); + FadeSetEnterScreen(); #endif info_mode = INFO_MODE_LEVELSET; @@ -2229,6 +2318,11 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); + /* (needed after displaying title screens which disable auto repeat) */ + KeyboardAutoRepeatOn(); + + FadeSetLeaveScreen(); + #if 1 FadeOut(redraw_mask); #endif @@ -3854,7 +3948,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) execSetupGame(); - else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) execSetupGraphics(); else execSetupArtwork(); @@ -4018,7 +4113,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else { - FadeSetStartItem(); + FadeSetEnterScreen(); node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; @@ -4037,7 +4132,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) execSetupGame(); - else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) execSetupGraphics(); else execSetupArtwork(); @@ -4087,7 +4183,9 @@ void DrawHallOfFame(int highlight_position) if (highlight_position < 0) LoadScore(level_nr); - FadeSetStartItem(); + FadeSetEnterScreen(); + + // printf("::: %d: %d\n", game_status, menu.enter_screen[game_status]); #if 1 FadeOut(REDRAW_FIELD); @@ -4222,6 +4320,7 @@ static struct TokenInfo *setup_info; static int num_setup_info; static char *screen_mode_text; +static char *scroll_delay_text; static char *game_speed_text; static char *graphics_set_name; static char *sounds_set_name; @@ -4376,6 +4475,55 @@ static void execSetupGraphics() screen_mode_text = screen_mode_current->name; } +#if 1 + if (scroll_delays == NULL) + { + int i; + + for (i = 0; scroll_delays_list[i].value != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = scroll_delays_list[i].value; + char *text = scroll_delays_list[i].text; + + ti->node_top = &scroll_delays; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Scroll Delay"); + + pushTreeInfo(&scroll_delays, ti); + } + + /* sort scroll delay values to start with lowest scroll delay value */ + sortTreeInfo(&scroll_delays); + + /* set current scroll delay value to configured scroll delay value */ + scroll_delay_current = + getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value)); + + /* if that fails, set current scroll delay to reliable default value */ + if (scroll_delay_current == NULL) + scroll_delay_current = + getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY)); + + /* if that also fails, set current scroll delay to first available value */ + if (scroll_delay_current == NULL) + scroll_delay_current = scroll_delays; + } + + setup.scroll_delay_value = atoi(scroll_delay_current->identifier); + + /* needed for displaying scroll delay text instead of identifier */ + scroll_delay_text = scroll_delay_current->name; +#endif + setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); } @@ -4393,6 +4541,16 @@ static void execSetupChooseScreenMode() DrawSetupScreen(); } +static void execSetupChooseScrollDelay() +{ +#if 0 + FadeSetEnterMenu(); +#endif + + setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY; + DrawSetupScreen(); +} + static void execSetupSound() { #if 0 @@ -4576,7 +4734,11 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, { TYPE_ENTER_LIST, execSetupChooseScreenMode, "Fullscreen Mode:" }, { TYPE_STRING, &screen_mode_text, "" }, - { TYPE_SWITCH, &setup.scroll_delay, "Delayed Scrolling:" }, +#if 0 + { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, +#endif + { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay Value:" }, + { TYPE_STRING, &scroll_delay_text, "" }, #if 0 { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" }, { TYPE_SWITCH, &setup.double_buffering,"Double-Buffering:" }, @@ -5805,6 +5967,8 @@ void DrawSetupScreen() DrawChooseTree(&game_speed_current); else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) DrawChooseTree(&screen_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) + DrawChooseTree(&scroll_delay_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) DrawChooseTree(&artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS) @@ -5832,6 +5996,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &game_speed_current); else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) + HandleChooseTree(mx, my, dx, dy, button, &scroll_delay_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)