X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ac88cbbedf89372adb10fff53e13f7a9a158695c;hb=c9433eab5c4317ed4f89164b386a7d33562e29be;hp=5479da0da318f2071f809b3b9d94ccf262ed8488;hpb=f25f84638db551dfef62b019ca2390193ad53600;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 5479da0d..ac88cbbe 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -26,12 +26,17 @@ /* screens in the setup menu */ #define SETUP_MODE_MAIN 0 -#define SETUP_MODE_INPUT 1 -#define SETUP_MODE_SHORTCUT 2 -#define SETUP_MODE_GRAPHICS 3 -#define SETUP_MODE_SOUND 4 - -#define MAX_SETUP_MODES 5 +#define SETUP_MODE_GAME 1 +#define SETUP_MODE_INPUT 2 +#define SETUP_MODE_SHORTCUT 3 +#define SETUP_MODE_GRAPHICS 4 +#define SETUP_MODE_SOUND 5 +#define SETUP_MODE_ARTWORK 6 +#define SETUP_MODE_CHOOSE_GRAPHICS 7 +#define SETUP_MODE_CHOOSE_SOUNDS 8 +#define SETUP_MODE_CHOOSE_MUSIC 9 + +#define MAX_SETUP_MODES 10 /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -59,9 +64,11 @@ static void HandleSetupScreen_Generic(int, int, int, int, int); static void HandleSetupScreen_Input(int, int, int, int, int); static void CustomizeKeyboard(int); static void CalibrateJoystick(int); +static void execSetupArtwork(void); static void HandleChooseTree(int, int, int, int, int, TreeInfo **); static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; +static int setup_mode = SETUP_MODE_MAIN; static void drawCursorExt(int pos, int color, int graphic) { @@ -130,8 +137,9 @@ void DrawMainMenu() UnmapAllGadgets(); FadeSounds(); KeyboardAutoRepeatOn(); - ActivateJoystickIfAvailable(); + ActivateJoystick(); SetDrawDeactivationMask(REDRAW_NONE); + audio.sound_deactivated = FALSE; /* needed if last screen was the playing screen, invoked from level editor */ if (level_editor_test_game) @@ -147,6 +155,9 @@ void DrawMainMenu() /* needed if last screen was the setup screen and fullscreen state changed */ ToggleFullscreenIfNeeded(); + /* needed if last screen (level choice) changed graphics, sounds or music */ + ReloadCustomArtwork(); + #ifdef TARGET_SDL SetDrawtoField(DRAW_BACKBUFFER); #endif @@ -156,7 +167,7 @@ void DrawMainMenu() /* leveldir_current may be invalid (level group, parent link) */ if (!validLevelSeries(leveldir_current)) - leveldir_current = getFirstValidLevelSeries(leveldir_last_valid); + leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid); /* store valid level series information */ leveldir_last_valid = leveldir_current; @@ -226,7 +237,6 @@ void DrawMainMenu() #if 0 ClearEventQueue(); #endif - } static void gotoTopLevelDir() @@ -392,6 +402,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) else if (y == 6) { game_status = SETUP; + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } else if (y == 7) @@ -808,7 +819,7 @@ void DrawHelpScreen() FadeToFront(); InitAnimation(); - PlaySoundLoop(SND_RHYTHMLOOP); + PlaySoundLoop(SND_MENU_INFO_SCREEN); } void HandleHelpScreen(int button) @@ -826,8 +837,8 @@ void HandleHelpScreen(int button) for(i=0;itype == TREE_TYPE_LEVEL_DIR ? 0 : 16); ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE); redraw_mask |= REDRAW_FIELD; title_string = (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Directories" : - ti->type == TREE_TYPE_GRAPHICS_DIR ? "Game Graphics" : - ti->type == TREE_TYPE_SOUNDS_DIR ? "Game Sounds" : - ti->type == TREE_TYPE_MUSIC_DIR ? "Game Music" : ""); + ti->type == TREE_TYPE_GRAPHICS_DIR ? "Custom Graphics" : + ti->type == TREE_TYPE_SOUNDS_DIR ? "Custom Sounds" : + ti->type == TREE_TYPE_MUSIC_DIR ? "Custom Music" : ""); - DrawText(SX, SY, title_string, FS_BIG, FC_GREEN); + DrawText(SX + offset, SY + offset, title_string, FS_BIG, + (ti->type == TREE_TYPE_LEVEL_DIR ? FC_GREEN : FC_YELLOW)); for(i=0; itype == TREE_TYPE_LEVEL_DIR ? "group" : "directory"); + + if (ti->type != TREE_TYPE_LEVEL_DIR) + return; node_first = getTreeInfoFirstGroupEntry(ti); node = getTreeInfoFromPos(node_first, entry_pos); @@ -1011,9 +1029,9 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32); if (node->parent_link) - DrawTextFCentered(40, FC_RED, "leave %s \"%s\"", text, node->class_desc); + DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc); else if (node->level_group) - DrawTextFCentered(40, FC_RED, "enter %s \"%s\"", text, node->class_desc); + DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc); else if (ti->type == TREE_TYPE_LEVEL_DIR) DrawTextFCentered(40, FC_RED, "%3d levels (%s)", node->levels, node->class_desc); @@ -1069,11 +1087,16 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, *ti_ptr = ti->node_parent; DrawChooseTree(ti_ptr); } + else if (game_status == SETUP) + { + execSetupArtwork(); + } else { game_status = MAINMENU; DrawMainMenu(); } + return; } @@ -1201,8 +1224,15 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, TapeErase(); } - game_status = MAINMENU; - DrawMainMenu(); + if (game_status == SETUP) + { + execSetupArtwork(); + } + else + { + game_status = MAINMENU; + DrawMainMenu(); + } } } } @@ -1223,296 +1253,6 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &leveldir_current); } - -#else - - -void DrawChooseLevel() -{ - UnmapAllGadgets(); - CloseDoor(DOOR_CLOSE_2); - - ClearWindow(); - HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE); - MapChooseLevelGadgets(); - - FadeToFront(); - InitAnimation(); -} - -static void AdjustChooseLevelScrollbar(int id, int first_entry) -{ - struct GadgetInfo *gi = screen_gadget[id]; - int items_max, items_visible, item_position; - - items_max = numTreeInfoInGroup(leveldir_current); - items_visible = MAX_MENU_ENTRIES_ON_SCREEN - 1; - item_position = first_entry; - - if (item_position > items_max - items_visible) - item_position = items_max - items_visible; - - ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max, - GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END); -} - -static void drawChooseLevelList(int first_entry, int num_page_entries) -{ - int i; - char buffer[SCR_FIELDX * 2]; - int max_buffer_len = (SCR_FIELDX - 2) * 2; - int num_leveldirs = numTreeInfoInGroup(leveldir_current); - - ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE); - redraw_mask |= REDRAW_FIELD; - - DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN); - - for(i=0; iname , max_buffer_len); - buffer[max_buffer_len] = '\0'; - - DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color); - - if (node->parent_link) - initCursor(i, GFX_ARROW_BLUE_LEFT); - else if (node->level_group) - initCursor(i, GFX_ARROW_BLUE_RIGHT); - else - initCursor(i, GFX_KUGEL_BLAU); - } - - if (first_entry > 0) - DrawGraphic(0, 1, GFX_ARROW_BLUE_UP); - - if (first_entry + num_page_entries < num_leveldirs) - DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN); -} - -static void drawChooseLevelInfo(int leveldir_pos) -{ - LevelDirTree *node, *node_first; - int x, last_redraw_mask = redraw_mask; - - node_first = getTreeInfoFirstGroupEntry(leveldir_current); - node = getTreeInfoFromPos(node_first, leveldir_pos); - - ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32); - - if (node->parent_link) - DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc); - else if (node->level_group) - DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc); - else - DrawTextFCentered(40, FC_RED, "%3d levels (%s)", - node->levels, node->class_desc); - - /* let BackToFront() redraw only what is needed */ - redraw_mask = last_redraw_mask | REDRAW_TILES; - for (x=0; xcl_cursor; - int step = (button == 1 ? 1 : button == 2 ? 5 : 10); - int num_leveldirs = numTreeInfoInGroup(leveldir_current); - int num_page_entries; - - if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN) - num_page_entries = num_leveldirs; - else - num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1; - - if (button == MB_MENU_INITIALIZE) - { - int leveldir_pos = posTreeInfo(leveldir_current); - - if (leveldir_current->cl_first == -1) - { - leveldir_current->cl_first = MAX(0, leveldir_pos - num_page_entries + 1); - leveldir_current->cl_cursor = - leveldir_pos - leveldir_current->cl_first; - } - - if (dx == 999) /* first entry is set by scrollbar position */ - leveldir_current->cl_first = dy; - else - AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, - leveldir_current->cl_first); - - drawChooseLevelList(leveldir_current->cl_first, num_page_entries); - drawChooseLevelInfo(leveldir_current->cl_first + - leveldir_current->cl_cursor); - drawCursor(leveldir_current->cl_cursor, FC_RED); - return; - } - else if (button == MB_MENU_LEAVE) - { - if (leveldir_current->node_parent) - { - leveldir_current = leveldir_current->node_parent; - DrawChooseLevel(); - } - else - { - game_status = MAINMENU; - DrawMainMenu(); - } - return; - } - - if (mx || my) /* mouse input */ - { - x = (mx - SX) / 32; - y = (my - SY) / 32 - MENU_SCREEN_START_YPOS; - } - else if (dx || dy) /* keyboard input */ - { - if (dy) - y = leveldir_current->cl_cursor + dy; - - if (ABS(dy) == SCR_FIELDY) /* handle KSYM_Page_Up, KSYM_Page_Down */ - { - dy = SIGN(dy); - step = num_page_entries - 1; - y = (dy < 0 ? -1 : num_page_entries); - } - } - - if (x == 0 && y == -1) - { - if (leveldir_current->cl_first > 0 && - (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) - { - leveldir_current->cl_first -= step; - if (leveldir_current->cl_first < 0) - leveldir_current->cl_first = 0; - - drawChooseLevelList(leveldir_current->cl_first, num_page_entries); - drawChooseLevelInfo(leveldir_current->cl_first + - leveldir_current->cl_cursor); - drawCursor(leveldir_current->cl_cursor, FC_RED); - AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, - leveldir_current->cl_first); - return; - } - } - else if (x == 0 && y > num_page_entries - 1) - { - if (leveldir_current->cl_first + num_page_entries < num_leveldirs && - (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) - { - leveldir_current->cl_first += step; - if (leveldir_current->cl_first + num_page_entries > num_leveldirs) - leveldir_current->cl_first = MAX(0, num_leveldirs - num_page_entries); - - drawChooseLevelList(leveldir_current->cl_first, num_page_entries); - drawChooseLevelInfo(leveldir_current->cl_first + - leveldir_current->cl_cursor); - drawCursor(leveldir_current->cl_cursor, FC_RED); - AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, - leveldir_current->cl_first); - return; - } - } - - if (dx == 1) - { - LevelDirTree *node_first, *node_cursor; - int leveldir_pos = leveldir_current->cl_first + y; - - node_first = getTreeInfoFirstGroupEntry(leveldir_current); - node_cursor = getTreeInfoFromPos(node_first, leveldir_pos); - - if (node_cursor->node_group) - { - node_cursor->cl_first = leveldir_current->cl_first; - node_cursor->cl_cursor = leveldir_current->cl_cursor; - leveldir_current = node_cursor->node_group; - DrawChooseLevel(); - return; - } - } - else if (dx == -1 && leveldir_current->node_parent) - { - leveldir_current = leveldir_current->node_parent; - DrawChooseLevel(); - return; - } - - if (x == 0 && y >= 0 && y < num_page_entries) - { - if (button) - { - if (y != leveldir_current->cl_cursor) - { - drawCursor(y, FC_RED); - drawCursor(leveldir_current->cl_cursor, FC_BLUE); - drawChooseLevelInfo(leveldir_current->cl_first + y); - leveldir_current->cl_cursor = y; - } - } - else - { - LevelDirTree *node_first, *node_cursor; - int leveldir_pos = leveldir_current->cl_first + y; - - node_first = getTreeInfoFirstGroupEntry(leveldir_current); - node_cursor = getTreeInfoFromPos(node_first, leveldir_pos); - - if (node_cursor->node_group) - { - node_cursor->cl_first = leveldir_current->cl_first; - node_cursor->cl_cursor = leveldir_current->cl_cursor; - leveldir_current = node_cursor->node_group; - - DrawChooseLevel(); - } - else if (node_cursor->parent_link) - { - leveldir_current = node_cursor->node_parent; - - DrawChooseLevel(); - } - else - { - node_cursor->cl_first = leveldir_current->cl_first; - node_cursor->cl_cursor = leveldir_current->cl_cursor; - leveldir_current = node_cursor; - - LoadLevelSetup_SeriesInfo(); - - SaveLevelSetup_LastSeries(); - SaveLevelSetup_SeriesInfo(); - TapeErase(); - - game_status = MAINMENU; - DrawMainMenu(); - } - } - } - - BackToFront(); - - if (game_status == CHOOSELEVEL) - DoAnimation(); -} - -#endif - - void DrawHallOfFame(int highlight_position) { UnmapAllGadgets(); @@ -1525,7 +1265,7 @@ void DrawHallOfFame(int highlight_position) FadeToFront(); InitAnimation(); HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE); - PlaySound(SND_HALLOFFAME); + PlaySound(SND_MENU_HALL_OF_FAME); } static void drawHallOfFameList(int first_entry, int highlight_position) @@ -1603,7 +1343,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) if (button_released) { - FadeSound(SND_HALLOFFAME); + FadeSound(SND_MENU_HALL_OF_FAME); game_status = MAINMENU; DrawMainMenu(); } @@ -1621,7 +1361,6 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) static struct TokenInfo *setup_info; static int num_setup_info; -static int setup_mode = SETUP_MODE_MAIN; static void execSetupMain() { @@ -1629,12 +1368,55 @@ static void execSetupMain() DrawSetupScreen(); } +static void execSetupGame() +{ + setup_mode = SETUP_MODE_GAME; + DrawSetupScreen(); +} + +static void execSetupGraphics() +{ + setup_mode = SETUP_MODE_GRAPHICS; + DrawSetupScreen(); +} + static void execSetupSound() { setup_mode = SETUP_MODE_SOUND; DrawSetupScreen(); } +static void execSetupArtwork() +{ + /* needed if last screen (setup choice) changed graphics, sounds or music */ + ReloadCustomArtwork(); + + setup.graphics_set = artwork.gfx_current->name; + setup.sounds_set = artwork.snd_current->name; + setup.music_set = artwork.mus_current->name; + + setup_mode = SETUP_MODE_ARTWORK; + DrawSetupScreen(); +} + +static void execSetupChooseGraphics() +{ + setup_mode = SETUP_MODE_CHOOSE_GRAPHICS; + DrawSetupScreen(); +} + +static void execSetupChooseSounds() +{ + setup_mode = SETUP_MODE_CHOOSE_SOUNDS; + DrawSetupScreen(); +} + +static void execSetupChooseMusic() +{ + setup_mode = SETUP_MODE_CHOOSE_MUSIC; + DrawSetupScreen(); +} + static void execSetupInput() { setup_mode = SETUP_MODE_INPUT; @@ -1661,46 +1443,73 @@ static void execSaveAndExitSetup() static struct TokenInfo setup_info_main[] = { - { TYPE_ENTER_MENU, execSetupSound, "Sound Setup" }, - { TYPE_ENTER_MENU, execSetupInput, "Input Devices" }, - { TYPE_ENTER_MENU, execSetupShortcut, "Key Shortcuts" }, -#if 0 - { TYPE_EMPTY, NULL, "" }, - { TYPE_SWITCH, &setup.sound, "Sound:", }, - { TYPE_SWITCH, &setup.sound_loops, " Sound Loops:" }, - { TYPE_SWITCH, &setup.sound_music, " Game Music:" }, -#endif - { TYPE_SWITCH, &setup.toons, "Toons:" }, -#if 0 - { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" }, -#endif - { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, - { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" }, + { TYPE_ENTER_MENU, execSetupGame, "Game Settings" }, + { TYPE_ENTER_MENU, execSetupGraphics, "Graphics" }, + { TYPE_ENTER_MENU, execSetupSound, "Sound & Music" }, + { TYPE_ENTER_MENU, execSetupArtwork, "Custom Artwork" }, + { TYPE_ENTER_MENU, execSetupInput, "Input Devices" }, + { TYPE_ENTER_MENU, execSetupShortcut, "Key Shortcuts" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, + { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" }, + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_game[] = +{ + { TYPE_SWITCH, &setup.team_mode, "Team-Mode:" }, + { TYPE_SWITCH, &setup.handicap, "Handicap:" }, + { TYPE_SWITCH, &setup.time_limit, "Timelimit:" }, + { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_graphics[] = +{ + { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, + { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, + { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" }, #if 0 - { TYPE_SWITCH, &setup.fading, "Fading:" }, + { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" }, + { TYPE_SWITCH, &setup.fading, "Fading:" }, #endif - { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, - { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" }, - { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" }, - { TYPE_SWITCH, &setup.team_mode, "Team-Mode:" }, - { TYPE_SWITCH, &setup.handicap, "Handicap:" }, - { TYPE_SWITCH, &setup.time_limit, "Timelimit:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, - { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" }, - { 0, NULL, NULL } + { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" }, + { TYPE_SWITCH, &setup.toons, "Toons:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { 0, NULL, NULL } }; static struct TokenInfo setup_info_sound[] = { - { TYPE_SWITCH, &setup.sound, "Sound:", }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_SWITCH, &setup.sound_simple, "Simple Sound:" }, - { TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" }, - { TYPE_SWITCH, &setup.sound_music, "Game Music:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, - { 0, NULL, NULL } + { TYPE_SWITCH, &setup.sound, "Sound:", }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.sound_simple, "Simple Sound:" }, + { TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" }, + { TYPE_SWITCH, &setup.sound_music, "Game Music:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_artwork[] = +{ + { TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" }, + { TYPE_STRING, &setup.graphics_set, "" }, + { TYPE_ENTER_MENU, execSetupChooseSounds, "Custom Sounds" }, + { TYPE_STRING, &setup.sounds_set, "" }, + { TYPE_ENTER_MENU, execSetupChooseMusic, "Custom Music" }, + { TYPE_STRING, &setup.music_set, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_STRING, NULL, "Override Level Artwork:"}, + { TYPE_YES_NO, &setup.override_level_graphics, "Graphics:" }, + { TYPE_YES_NO, &setup.override_level_sounds, "Sounds:" }, + { TYPE_YES_NO, &setup.override_level_music, "Music:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, + { 0, NULL, NULL } }; static struct TokenInfo setup_info_shortcut[] = @@ -1709,6 +1518,10 @@ static struct TokenInfo setup_info_shortcut[] = { TYPE_KEY, &setup.shortcut.save_game, "" }, { TYPE_KEYTEXT, NULL, "Quick Load Game:", }, { TYPE_KEY, &setup.shortcut.load_game, "" }, + { TYPE_KEYTEXT, NULL, "Toggle Pause:", }, + { TYPE_KEY, &setup.shortcut.toggle_pause, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_YES_NO, &setup.ask_on_escape, "Ask on Esc:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Exit" }, { 0, NULL, NULL } @@ -1765,10 +1578,14 @@ static void drawSetupValue(int pos) { int xpos = MENU_SCREEN_VALUE_XPOS; int ypos = MENU_SCREEN_START_YPOS + pos; - int value_color = FC_YELLOW; + int font_size = FS_BIG; + int font_color = FC_YELLOW; char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED, setup_info[pos].value); + if (value_string == NULL) + return; + if (setup_info[pos].type & TYPE_KEY) { xpos = 3; @@ -1776,17 +1593,26 @@ static void drawSetupValue(int pos) if (setup_info[pos].type & TYPE_QUERY) { value_string = ""; - value_color = FC_RED; + font_color = FC_RED; } } + else if (setup_info[pos].type & TYPE_STRING) + { + int max_value_len = (SCR_FIELDX - 2) * 2; - if (setup_info[pos].type & TYPE_BOOLEAN_STYLE && - !*(boolean *)(setup_info[pos].value)) - value_color = FC_BLUE; + xpos = 1; + font_size = FS_MEDIUM; + + if (strlen(value_string) > max_value_len) + value_string[max_value_len] = '\0'; + } + else if (setup_info[pos].type & TYPE_BOOLEAN_STYLE && + !*(boolean *)(setup_info[pos].value)) + font_color = FC_BLUE; DrawText(SX + xpos * 32, SY + ypos * 32, (xpos == 3 ? " " : " "), FS_BIG, FC_YELLOW); - DrawText(SX + xpos * 32, SY + ypos * 32, value_string, FS_BIG, value_color); + DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_size,font_color); } static void changeSetupValue(int pos) @@ -1825,11 +1651,26 @@ static void DrawSetupScreen_Generic() setup_info = setup_info_main; title_string = "Setup"; } + else if (setup_mode == SETUP_MODE_GAME) + { + setup_info = setup_info_game; + title_string = "Setup Game"; + } + else if (setup_mode == SETUP_MODE_GRAPHICS) + { + setup_info = setup_info_graphics; + title_string = "Setup Graphics"; + } else if (setup_mode == SETUP_MODE_SOUND) { setup_info = setup_info_sound; title_string = "Setup Sound"; } + else if (setup_mode == SETUP_MODE_ARTWORK) + { + setup_info = setup_info_artwork; + title_string = "Custom Artwork"; + } else if (setup_mode == SETUP_MODE_SHORTCUT) { setup_info = setup_info_shortcut; @@ -1843,16 +1684,19 @@ static void DrawSetupScreen_Generic() { void *value_ptr = setup_info[i].value; int ypos = MENU_SCREEN_START_YPOS + i; + int font_size = FS_BIG; /* set some entries to "unchangeable" according to other variables */ if ((value_ptr == &setup.sound && !audio.sound_available) || (value_ptr == &setup.sound_loops && !audio.loops_available) || (value_ptr == &setup.sound_music && !audio.music_available) || - (value_ptr == &setup.sound_music && !audio.music_available) || (value_ptr == &setup.fullscreen && !video.fullscreen_available)) setup_info[i].type |= TYPE_GHOSTED; - DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, FS_BIG, FC_GREEN); + if (setup_info[i].type & TYPE_STRING) + font_size = FS_MEDIUM; + + DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN); if (setup_info[i].type & TYPE_ENTER_MENU) initCursor(i, GFX_ARROW_BLUE_RIGHT); @@ -1938,26 +1782,6 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) } else if (!(setup_info[y].type & TYPE_GHOSTED)) { -#if 0 - if (setup_info[y].type & TYPE_BOOLEAN_STYLE) - { - boolean new_value = !*(boolean *)(setup_info[y].value); - - *(boolean *)setup_info[y].value = new_value; - drawSetupValue(y); - } - else if (setup_info[y].type == TYPE_KEYTEXT && - setup_info[y + 1].type == TYPE_KEY) - { - changeSetupValue(y + 1); - } - else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU) - { - void (*menu_callback_function)(void) = setup_info[choice].value; - - menu_callback_function(); - } -#else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU) { void (*menu_callback_function)(void) = setup_info[choice].value; @@ -1973,7 +1797,6 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) if (setup_info[y].type & TYPE_VALUE) changeSetupValue(y); } -#endif } } @@ -2000,9 +1823,11 @@ void DrawSetupScreen_Input() DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN); DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN); +#if 0 DeactivateJoystickForCalibration(); DrawTextFCentered(SYSIZE - 20, FC_BLUE, "Joysticks deactivated on this screen"); +#endif HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE); FadeToFront(); @@ -2272,7 +2097,7 @@ void CustomizeKeyboard(int player_nr) { case EVENT_KEYPRESS: { - Key key = GetEventKey((KeyEvent *)&event, TRUE); + Key key = GetEventKey((KeyEvent *)&event, FALSE); if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { @@ -2551,8 +2376,16 @@ void CalibrateJoystick(int player_nr) void DrawSetupScreen() { + DeactivateJoystick(); + if (setup_mode == SETUP_MODE_INPUT) DrawSetupScreen_Input(); + else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) + DrawChooseTree(&artwork.gfx_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS) + DrawChooseTree(&artwork.snd_current); + else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC) + DrawChooseTree(&artwork.mus_current); else DrawSetupScreen_Generic(); } @@ -2561,6 +2394,12 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) { if (setup_mode == SETUP_MODE_INPUT) HandleSetupScreen_Input(mx, my, dx, dy, button); + 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) + HandleChooseTree(mx, my, dx, dy, button, &artwork.snd_current); + else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC) + HandleChooseTree(mx, my, dx, dy, button, &artwork.mus_current); else HandleSetupScreen_Generic(mx, my, dx, dy, button); } @@ -2615,13 +2454,13 @@ static struct SC_SCROLLBUTTON_XPOS + 0 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS, SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS, SCREEN_CTRL_ID_SCROLL_UP, - "scroll level series up" + "scroll up" }, { SC_SCROLLBUTTON_XPOS + 1 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS, SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS, SCREEN_CTRL_ID_SCROLL_DOWN, - "scroll level series down" + "scroll down" } }; @@ -2762,12 +2601,12 @@ void CreateScreenGadgets() CreateScreenScrollbars(); } -void MapChooseTreeGadgets() +void MapChooseTreeGadgets(TreeInfo *ti) { - int num_leveldirs = numTreeInfoInGroup(leveldir_current); + int num_entries = numTreeInfoInGroup(ti); int i; - if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN) + if (num_entries <= MAX_MENU_ENTRIES_ON_SCREEN) return; for (i=0; icustom_id; - if (game_status != CHOOSELEVEL) + if (game_status != CHOOSELEVEL && game_status != SETUP) return; switch (id) { case SCREEN_CTRL_ID_SCROLL_UP: - HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK); + if (game_status == CHOOSELEVEL) + HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK); + else if (game_status == SETUP) + HandleSetupScreen(SX,SY + 32, 0,0, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_DOWN: - HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK); + if (game_status == CHOOSELEVEL) + HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK); + else if (game_status == SETUP) + HandleSetupScreen(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_VERTICAL: - HandleChooseLevel(0,0, 999,gi->event.item_position, MB_MENU_INITIALIZE); + if (game_status == CHOOSELEVEL) + HandleChooseLevel(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); + else if (game_status == SETUP) + HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); break; default: