X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=7a7fe1afcc03e553080458d7787057bf822890cc;hb=b640b9d7647df4cbba0e530f6f4bcece384048e4;hp=50c8685ab59f7116c9ba68ec9612545b50d0430c;hpb=9c285b0e8e4d81c5559815c5f7142685ce865206;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 50c8685a..7a7fe1af 100644 --- a/src/screens.c +++ b/src/screens.c @@ -29,15 +29,16 @@ #define SETUP_MODE_GAME 1 #define SETUP_MODE_EDITOR 2 #define SETUP_MODE_INPUT 3 -#define SETUP_MODE_SHORTCUT 4 -#define SETUP_MODE_GRAPHICS 5 -#define SETUP_MODE_SOUND 6 -#define SETUP_MODE_ARTWORK 7 -#define SETUP_MODE_CHOOSE_GRAPHICS 8 -#define SETUP_MODE_CHOOSE_SOUNDS 9 -#define SETUP_MODE_CHOOSE_MUSIC 10 +#define SETUP_MODE_SHORTCUT_1 4 +#define SETUP_MODE_SHORTCUT_2 5 +#define SETUP_MODE_GRAPHICS 6 +#define SETUP_MODE_SOUND 7 +#define SETUP_MODE_ARTWORK 8 +#define SETUP_MODE_CHOOSE_GRAPHICS 9 +#define SETUP_MODE_CHOOSE_SOUNDS 10 +#define SETUP_MODE_CHOOSE_MUSIC 11 -#define MAX_SETUP_MODES 11 +#define MAX_SETUP_MODES 12 /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -60,6 +61,9 @@ #define MAX_MENU_ENTRIES_ON_SCREEN (SCR_FIELDY - 2) #define MENU_SCREEN_START_YPOS 2 #define MENU_SCREEN_VALUE_XPOS 14 +#define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) +#define MENU_TITLE1_YPOS 8 +#define MENU_TITLE2_YPOS 46 /* buttons and scrollbars identifiers */ #define SCREEN_CTRL_ID_SCROLL_UP 0 @@ -97,12 +101,13 @@ static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; static int setup_mode = SETUP_MODE_MAIN; static int info_mode = INFO_MODE_MAIN; -#define mSX (SX + (game_status >= GAME_MODE_MAIN && \ - game_status <= GAME_MODE_SETUP ? \ - menu.draw_xoffset[game_status] : menu.draw_xoffset_default)) -#define mSY (SY + (game_status >= GAME_MODE_MAIN && \ - game_status <= GAME_MODE_SETUP ? \ - menu.draw_yoffset[game_status] : menu.draw_yoffset_default)) +#define DRAW_OFFSET_MODE(x) (x >= GAME_MODE_MAIN && \ + x <= GAME_MODE_SETUP ? x : \ + x == GAME_MODE_PSEUDO_TYPENAME ? \ + GAME_MODE_MAIN : GAME_MODE_DEFAULT) + +#define mSX (SX + menu.draw_xoffset[DRAW_OFFSET_MODE(game_status)]) +#define mSY (SY + menu.draw_yoffset[DRAW_OFFSET_MODE(game_status)]) #define NUM_MENU_ENTRIES_ON_SCREEN (menu.list_size[game_status] > 2 ? \ menu.list_size[game_status] : \ @@ -114,28 +119,31 @@ static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS]; #endif -static void drawCursorExt(int xpos, int ypos, int color, int graphic) +static void drawCursorExt(int xpos, int ypos, int color, int g) { static int cursor_array[SCR_FIELDY]; if (xpos == 0) { - if (graphic != 0) - cursor_array[ypos] = graphic; + if (g != 0) + cursor_array[ypos] = g; else - graphic = cursor_array[ypos]; + g = cursor_array[ypos]; } if (color == FC_RED) - graphic = (graphic == IMG_MENU_BUTTON_LEFT ? IMG_MENU_BUTTON_LEFT_ACTIVE : - graphic == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE: - IMG_MENU_BUTTON_ACTIVE); + g = (g == IMG_MENU_BUTTON_LEFT ? IMG_MENU_BUTTON_LEFT_ACTIVE : + g == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE : + g == IMG_MENU_BUTTON_LEAVE_MENU ? IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE : + g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE : + g == IMG_MENU_BUTTON_LAST_LEVEL ? IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE : + g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE : + IMG_MENU_BUTTON_ACTIVE); ypos += MENU_SCREEN_START_YPOS; DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY); - DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY, - graphic, 0); + DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY, g, 0); } static void initCursor(int ypos, int graphic) @@ -201,8 +209,8 @@ static void PlayMenuMusic() void DrawHeadline() { - DrawTextSCentered(8, FONT_TITLE_1, PROGRAM_TITLE_STRING); - DrawTextSCentered(46, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING); + DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, PROGRAM_TITLE_STRING); + DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING); } static void ToggleFullscreenIfNeeded() @@ -229,10 +237,35 @@ static void ToggleFullscreenIfNeeded() } } +static int getLastLevelButtonPos() +{ + return 10; +} + +static int getCurrentLevelTextPos() +{ + return (getLastLevelButtonPos() + 1); +} + +static int getNextLevelButtonPos() +{ + return getLastLevelButtonPos() + 3 + 1; +} + +static int getLevelRangeTextPos() +{ + return getNextLevelButtonPos() + 1; +} + void DrawMainMenu() { static LevelDirTree *leveldir_last_valid = NULL; char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:"); +#if 1 + char *level_text = "Levelset"; +#else + char *level_text = "Level:"; +#endif int name_width, level_width; int i; @@ -276,8 +309,10 @@ void DrawMainMenu() SetDrawtoField(DRAW_BACKBUFFER); #endif +#if 0 /* map gadgets for main menu screen */ MapTapeButtons(); +#endif /* level_nr may have been set to value over handicap with level editor */ if (setup.handicap && level_nr > leveldir_current->handicap_level) @@ -291,28 +326,74 @@ void DrawMainMenu() DrawHeadline(); - DrawText(mSX + 32, mSY + 2*32, name_text, FONT_MENU_1); - DrawText(mSX + 32, mSY + 3*32, "Level:", FONT_MENU_1); - DrawText(mSX + 32, mSY + 4*32, "Hall Of Fame", FONT_MENU_1); - DrawText(mSX + 32, mSY + 5*32, "Level Creator", FONT_MENU_1); - DrawText(mSX + 32, mSY + 6*32, "Info Screen", FONT_MENU_1); - DrawText(mSX + 32, mSY + 7*32, "Start Game", FONT_MENU_1); - DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1); - DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1); + DrawText(mSX + 32, mSY + 2 * 32, name_text, FONT_MENU_1); + DrawText(mSX + 32, mSY + 3 * 32, level_text, FONT_MENU_1); + DrawText(mSX + 32, mSY + 4 * 32, "Hall Of Fame", FONT_MENU_1); + DrawText(mSX + 32, mSY + 5 * 32, "Level Creator", FONT_MENU_1); + DrawText(mSX + 32, mSY + 6 * 32, "Info Screen", FONT_MENU_1); + DrawText(mSX + 32, mSY + 7 * 32, "Start Game", FONT_MENU_1); + DrawText(mSX + 32, mSY + 8 * 32, "Setup", FONT_MENU_1); + DrawText(mSX + 32, mSY + 9 * 32, "Quit", FONT_MENU_1); /* calculated after (possible) reload of custom artwork */ - name_width = getTextWidth(name_text, FONT_MENU_1); - level_width = getTextWidth("Level:", FONT_MENU_1); + name_width = getTextWidth(name_text, FONT_MENU_1); +#if 1 + level_width = 9 * 32; +#else +#if 1 + level_width = 9 * getFontWidth(FONT_MENU_1); +#else + level_width = getTextWidth(level_text, FONT_MENU_1); +#endif +#endif + + DrawText(mSX + 32 + name_width, mSY + 2 * 32, setup.player_name, + FONT_INPUT_1); - DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT_1); - DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3), +#if 1 + DrawText(mSX + getCurrentLevelTextPos() * 32, mSY + 3 * 32, + int2str(level_nr, 3), FONT_VALUE_1); +#else +#if 1 + DrawText(mSX + level_width + 2 * 32, mSY + 3 * 32, int2str(level_nr, 3), + FONT_VALUE_1); +#else + DrawText(mSX + level_width + 5 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); +#endif +#endif - DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); + DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE); - DrawTextF(mSX + 32 + level_width - 2, mSY + 3*32 + 1, FONT_TEXT_3, "%d-%d", +#if 1 + +#if 1 + { + int text_height = getFontHeight(FONT_TEXT_3); +#if 1 + int xpos = getLevelRangeTextPos() * 32; +#else + int xpos = level_width + 6 * 32; +#endif + int ypos2 = -SY + 3 * 32 + 16; + int ypos1 = ypos2 - text_height; + + DrawTextF(mSX + xpos, mSY + ypos1, FONT_TEXT_3, + "%03d", leveldir_current->first_level); + DrawTextF(mSX + xpos, mSY + ypos2, FONT_TEXT_3, + "%03d", leveldir_current->last_level); + } +#else + DrawTextF(mSX + level_width + 6 * 32, mSY + 3 * 32 + 1, FONT_TEXT_3, + "%d", leveldir_current->levels); +#endif + +#else + DrawTextF(mSX + 32 + level_width - 2, mSY + 3 * 32 + 1, FONT_TEXT_3, "%d-%d", leveldir_current->first_level, leveldir_current->last_level); +#endif +#if 0 if (leveldir_current->readonly) { DrawTextS(mSX + level_width + 9 * 32 - 2, @@ -320,13 +401,24 @@ void DrawMainMenu() DrawTextS(mSX + level_width + 9 * 32 - 2, mSY + 3 * 32 + 1 + 7, FONT_TEXT_3, "ONLY"); } +#endif for (i = 0; i < 8; i++) - initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_RIGHT : + initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_ENTER_MENU : IMG_MENU_BUTTON)); - drawCursorXY(level_width/32 + 4, 1, IMG_MENU_BUTTON_LEFT); - drawCursorXY(level_width/32 + 8, 1, IMG_MENU_BUTTON_RIGHT); +#if 1 + drawCursorXY(getLastLevelButtonPos(), 1, IMG_MENU_BUTTON_LAST_LEVEL); + drawCursorXY(getNextLevelButtonPos(), 1, IMG_MENU_BUTTON_NEXT_LEVEL); +#else +#if 1 + drawCursorXY(level_width / 32 + 1, 1, IMG_MENU_BUTTON_LEFT); + drawCursorXY(level_width / 32 + 5, 1, IMG_MENU_BUTTON_RIGHT); +#else + drawCursorXY(level_width / 32 + 4, 1, IMG_MENU_BUTTON_LEFT); + drawCursorXY(level_width / 32 + 8, 1, IMG_MENU_BUTTON_RIGHT); +#endif +#endif DrawTextSCentered(326, FONT_TITLE_2, "A Game by Artsoft Entertainment"); @@ -344,8 +436,14 @@ void DrawMainMenu() PlayMenuMusic(); OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2); + +#if 1 + /* map gadgets for main menu screen */ + MapTapeButtons(); +#endif } +#if 0 static void gotoTopLevelDir() { /* move upwards to top level directory */ @@ -374,9 +472,11 @@ static void gotoTopLevelDir() leveldir_current = leveldir_current->node_parent; } } +#endif void HandleMainMenu(int mx, int my, int dx, int dy, int button) { + static unsigned long level_delay = 0; static int choice = 5; int x = 0; int y = choice; @@ -396,15 +496,19 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { if (dx && choice == 1) x = (dx < 0 ? 10 : 14); + else if (dx > 0) + { + if (choice == 4 || choice == 6) + button = MB_MENU_CHOICE; + } else if (dy) y = choice + dy; } if (y == 1 && ((x == 10 && level_nr > leveldir_current->first_level) || (x == 14 && level_nr < leveldir_current->last_level)) && - button) + button && DelayReached(&level_delay, GADGET_FRAME_DELAY)) { - static unsigned long level_delay = 0; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); int old_level_nr = level_nr; int new_level_nr; @@ -416,10 +520,19 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) new_level_nr = leveldir_current->last_level; if (setup.handicap && new_level_nr > leveldir_current->handicap_level) + { + /* skipping levels is only allowed when trying to skip single level */ + if (setup.skip_levels && step == 1 && + Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK)) + { + leveldir_current->handicap_level++; + SaveLevelSetup_SeriesInfo(); + } + new_level_nr = leveldir_current->handicap_level; + } - if (new_level_nr != old_level_nr && - DelayReached(&level_delay, GADGET_FRAME_DELAY)) + if (new_level_nr != old_level_nr) { level_nr = new_level_nr; @@ -427,7 +540,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) FONT_VALUE_1); LoadLevel(level_nr); - DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE); + DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE); TapeErase(); LoadTape(level_nr); @@ -466,7 +579,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) SaveLevelSetup_LastSeries(); SaveLevelSetup_SeriesInfo(); +#if 0 gotoTopLevelDir(); +#endif DrawChooseLevel(); } @@ -492,30 +607,20 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y == 5) { - if (setup.autorecord) - TapeStartRecording(); - -#if defined(PLATFORM_UNIX) - if (options.network) - SendToServer_StartPlaying(); - else -#endif - { - game_status = GAME_MODE_PLAYING; - StopAnimation(); - InitGame(); - } + StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE); } else if (y == 6) { game_status = GAME_MODE_SETUP; setup_mode = SETUP_MODE_MAIN; + DrawSetupScreen(); } else if (y == 7) { SaveLevelSetup_LastSeries(); SaveLevelSetup_SeriesInfo(); + if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = GAME_MODE_QUIT; } @@ -524,7 +629,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (game_status == GAME_MODE_MAIN) { - DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, FALSE); + DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, FALSE); DoAnimation(); } } @@ -595,7 +700,11 @@ static void DrawInfoScreen_Main() ClearWindow(); +#if 1 + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen"); +#else DrawText(mSX + 16, mSY + 16, "Info Screen", FONT_TITLE_1); +#endif info_info = info_info_main; num_info_info = 0; @@ -608,9 +717,9 @@ static void DrawInfoScreen_Main() DrawText(mSX + 32, mSY + ypos * 32, info_info[i].text, font_nr); if (info_info[i].type & TYPE_ENTER_MENU) - initCursor(i, IMG_MENU_BUTTON_RIGHT); + initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); else if (info_info[i].type & TYPE_LEAVE_MENU) - initCursor(i, IMG_MENU_BUTTON_LEFT); + initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); else if (info_info[i].type & ~TYPE_SKIP_ENTRY) initCursor(i, IMG_MENU_BUTTON); @@ -727,7 +836,6 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++) infoscreen_step[i] = infoscreen_frame[i] = 0; - SetMainBackgroundImage(IMG_BACKGROUND_INFO); ClearWindow(); DrawHeadline(); @@ -762,12 +870,15 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) action = helpanim_info[j].action; direction = helpanim_info[j].direction; + if (element < 0) + element = EL_UNKNOWN; + if (action != -1 && direction != -1) graphic = el_act_dir2img(element, action, direction); else if (action != -1) graphic = el_act2img(element, action); else if (direction != -1) - graphic = el_act2img(element, direction); + graphic = el_dir2img(element, direction); else graphic = el2img(element); @@ -828,18 +939,14 @@ static char *getHelpText(int element, int action, int direction) strcat(token, element_action_info[action].suffix); if (direction != -1) - strcat(token, element_direction_info[MV_DIR_BIT(direction)].suffix); + strcat(token, element_direction_info[MV_DIR_TO_BIT(direction)].suffix); return getHashEntry(helptext_info, token); } void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) { -#if 0 - int font_nr = FONT_TEXT_2; -#else int font_nr = FONT_LEVEL_NUMBER; -#endif int font_width = getFontWidth(font_nr); int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX; int sy = mSY + 65 + 2 * 32 + 1; @@ -873,6 +980,8 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) void DrawInfoScreen_Elements() { + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); + LoadHelpAnimInfo(); LoadHelpTextInfo(); @@ -938,7 +1047,7 @@ void HandleInfoScreen_Elements(int button) } else { - if (DelayReached(&info_delay, GAME_FRAME_DELAY)) + if (DelayReached(&info_delay, GameFrameDelay)) if (page < num_pages) DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, FALSE); @@ -948,6 +1057,8 @@ void HandleInfoScreen_Elements(int button) void DrawInfoScreen_Music() { + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); + ClearWindow(); DrawHeadline(); @@ -1080,6 +1191,8 @@ void DrawInfoScreen_Credits() int ystart = 150, ystep = 30; int ybottom = SYSIZE - 20; + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS); + FadeSoundsAndMusic(); ClearWindow(); @@ -1128,6 +1241,8 @@ void DrawInfoScreen_Program() int ystart = 150, ystep = 30; int ybottom = SYSIZE - 20; + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); + ClearWindow(); DrawHeadline(); @@ -1191,11 +1306,7 @@ void DrawInfoScreen_LevelSet() int ystart = 150; int ybottom = SYSIZE - 20; char *filename = getLevelSetInfoFilename(); -#if 0 - int font_nr = FONT_TEXT_2; -#else int font_nr = FONT_LEVEL_NUMBER; -#endif int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); int pad_x = 32; @@ -1205,6 +1316,8 @@ void DrawInfoScreen_LevelSet() int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width; int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1; + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); + ClearWindow(); DrawHeadline(); @@ -1393,19 +1506,38 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, char buffer[SCR_FIELDX * 2]; int max_buffer_len = (SCR_FIELDX - 2) * 2; char *title_string = NULL; +#if 0 + int xoffset_sets = 16; +#endif + int yoffset_sets = MENU_TITLE1_YPOS; +#if 0 int xoffset_setup = 16; +#endif int yoffset_setup = 16; +#if 1 +#if 0 + int xoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? xoffset_sets : + xoffset_setup); +#endif + int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? yoffset_sets : + yoffset_setup); +#else int xoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : xoffset_setup); int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : yoffset_setup); +#endif int last_game_status = game_status; /* save current game status */ title_string = - (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Directories" : + (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Sets" : ti->type == TREE_TYPE_GRAPHICS_DIR ? "Custom Graphics" : ti->type == TREE_TYPE_SOUNDS_DIR ? "Custom Sounds" : ti->type == TREE_TYPE_MUSIC_DIR ? "Custom Music" : ""); +#if 1 + DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string); +#else DrawText(SX + xoffset, SY + yoffset, title_string, FONT_TITLE_1); +#endif /* force LEVELS font on artwork setup screen */ game_status = GAME_MODE_LEVELS; @@ -1424,15 +1556,15 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, node_first = getTreeInfoFirstGroupEntry(ti); node = getTreeInfoFromPos(node_first, entry_pos); - strncpy(buffer, node->name , max_buffer_len); + strncpy(buffer, node->name, max_buffer_len); buffer[max_buffer_len] = '\0'; DrawText(mSX + 32, mSY + ypos * 32, buffer, FONT_TEXT_1 + node->color); if (node->parent_link) - initCursor(i, IMG_MENU_BUTTON_LEFT); + initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); else if (node->level_group) - initCursor(i, IMG_MENU_BUTTON_RIGHT); + initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); else initCursor(i, IMG_MENU_BUTTON); } @@ -1446,6 +1578,11 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) { TreeInfo *node, *node_first; int x, last_redraw_mask = redraw_mask; +#if 1 + int ypos = MENU_TITLE2_YPOS; +#else + int ypos = 40; +#endif if (ti->type != TREE_TYPE_LEVEL_DIR) return; @@ -1453,16 +1590,16 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) node_first = getTreeInfoFirstGroupEntry(ti); node = getTreeInfoFromPos(node_first, entry_pos); - DrawBackground(SX + 32, SY + 32, SXSIZE - 64, 32); + DrawBackground(SX, SY + ypos, SXSIZE, getFontHeight(FONT_TITLE_2)); if (node->parent_link) - DrawTextFCentered(40, FONT_TITLE_2, "leave group \"%s\"", + DrawTextFCentered(ypos, FONT_TITLE_2, "leave group \"%s\"", node->class_desc); else if (node->level_group) - DrawTextFCentered(40, FONT_TITLE_2, "enter group \"%s\"", + DrawTextFCentered(ypos, FONT_TITLE_2, "enter group \"%s\"", node->class_desc); else if (ti->type == TREE_TYPE_LEVEL_DIR) - DrawTextFCentered(40, FONT_TITLE_2, "%3d levels (%s)", + DrawTextFCentered(ypos, FONT_TITLE_2, "%3d levels (%s)", node->levels, node->class_desc); /* let BackToFront() redraw only what is needed */ @@ -1481,6 +1618,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, int num_entries = numTreeInfoInGroup(ti); int num_page_entries; int last_game_status = game_status; /* save current game status */ + boolean position_set_by_scrollbar = (dx == 999); /* force LEVELS draw offset on choose level and artwork setup screen */ game_status = GAME_MODE_LEVELS; @@ -1512,7 +1650,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, ti->cl_cursor = entry_pos - ti->cl_first; } - if (dx == 999) /* first entry is set by scrollbar position */ + if (position_set_by_scrollbar) ti->cl_first = dy; else AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, @@ -1634,7 +1772,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, return; } - if (IN_VIS_FIELD(x, y) && + if (!anyScrollbarGadgetActive() && + IN_VIS_FIELD(x, y) && mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x && y >= 0 && y < num_page_entries) { @@ -1739,8 +1878,15 @@ static void drawHallOfFameList(int first_entry, int highlight_position) SetMainBackgroundImage(IMG_BACKGROUND_SCORES); ClearWindow(); - DrawText(mSX + 80, mSY + 8, "Hall Of Fame", FONT_TITLE_1); - DrawTextFCentered(46, FONT_TITLE_2, "HighScores of Level %d", level_nr); +#if 1 + DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, "Hall Of Fame"); + DrawTextFCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, + "HighScores of Level %d", level_nr); +#else + DrawText(mSX + 80, mSY + MENU_TITLE1_YPOS, "Hall Of Fame", FONT_TITLE_1); + DrawTextFCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, + "HighScores of Level %d", level_nr); +#endif for (i = 0; i < NUM_MENU_ENTRIES_ON_SCREEN; i++) { @@ -1904,9 +2050,15 @@ static void execSetupInput() DrawSetupScreen(); } -static void execSetupShortcut() +static void execSetupShortcut1() +{ + setup_mode = SETUP_MODE_SHORTCUT_1; + DrawSetupScreen(); +} + +static void execSetupShortcut2() { - setup_mode = SETUP_MODE_SHORTCUT; + setup_mode = SETUP_MODE_SHORTCUT_2; DrawSetupScreen(); } @@ -1924,13 +2076,14 @@ static void execSaveAndExitSetup() static struct TokenInfo setup_info_main[] = { - { TYPE_ENTER_MENU, execSetupGame, "Game Settings" }, - { TYPE_ENTER_MENU, execSetupEditor, "Editor Settings" }, + { TYPE_ENTER_MENU, execSetupGame, "Game & Menu" }, + { TYPE_ENTER_MENU, execSetupEditor, "Editor" }, { 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_ENTER_MENU, execSetupShortcut1, "Key Shortcuts 1" }, + { TYPE_ENTER_MENU, execSetupShortcut2, "Key Shortcuts 2" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and Exit" }, @@ -1940,10 +2093,12 @@ static struct TokenInfo setup_info_main[] = static struct TokenInfo setup_info_game[] = { - { TYPE_SWITCH, &setup.team_mode, "Team-Mode:" }, + { TYPE_SWITCH, &setup.team_mode, "Team-Mode (Multi-Player):" }, + { TYPE_YES_NO, &setup.input_on_focus, "Only Move Focussed Player:" }, { TYPE_SWITCH, &setup.handicap, "Handicap:" }, - { TYPE_SWITCH, &setup.time_limit, "Timelimit:" }, - { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" }, + { TYPE_SWITCH, &setup.skip_levels, "Skip Unsolved Levels:" }, + { TYPE_SWITCH, &setup.time_limit, "Time Limit:" }, + { TYPE_SWITCH, &setup.autorecord, "Auto-Record Tapes:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -1952,21 +2107,19 @@ static struct TokenInfo setup_info_game[] = static struct TokenInfo setup_info_editor[] = { -#if 0 - { TYPE_STRING, NULL, "Offer Special Elements:"}, -#endif - { TYPE_SWITCH, &setup.editor.el_boulderdash, "BoulderDash:" }, + { TYPE_SWITCH, &setup.editor.el_boulderdash, "Boulder Dash:" }, { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" }, - { TYPE_SWITCH, &setup.editor.el_more, "More:" }, + { TYPE_SWITCH, &setup.editor.el_emerald_mine_club, "Emerald Mine Club:" }, + { TYPE_SWITCH, &setup.editor.el_more, "Rocks'n'Diamonds:" }, { TYPE_SWITCH, &setup.editor.el_sokoban, "Sokoban:" }, { TYPE_SWITCH, &setup.editor.el_supaplex, "Supaplex:" }, - { TYPE_SWITCH, &setup.editor.el_diamond_caves, "Diamd. Caves:" }, - { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX Boulderd.:" }, - { TYPE_SWITCH, &setup.editor.el_chars, "Characters:" }, - { TYPE_SWITCH, &setup.editor.el_custom, "Custom:" }, - { TYPE_SWITCH, &setup.editor.el_custom_more, "More Custom:" }, + { TYPE_SWITCH, &setup.editor.el_diamond_caves, "Diamond Caves II:" }, + { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" }, + { TYPE_SWITCH, &setup.editor.el_chars, "Text Characters:" }, + { TYPE_SWITCH, &setup.editor.el_custom, "Custom & Group Elements:" }, { TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" }, - { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined:" }, + { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined element list:" }, + { TYPE_SWITCH, &setup.editor.el_dynamic, "Dynamic level elements:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -1975,15 +2128,17 @@ static struct TokenInfo setup_info_editor[] = 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.:" }, + { TYPE_SWITCH, &setup.fullscreen, "Fullscreen Mode:" }, + { TYPE_SWITCH, &setup.scroll_delay, "Delayed Scrolling:" }, #if 0 - { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" }, + { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" }, + { TYPE_SWITCH, &setup.double_buffering,"Double-Buffering:" }, { TYPE_SWITCH, &setup.fading, "Fading:" }, #endif - { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" }, + { TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" }, + { TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" }, { TYPE_SWITCH, &setup.toons, "Toons:" }, + { TYPE_ECS_AGA, &setup.prefer_aga_graphics,"EMC graphics preference:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -1992,9 +2147,9 @@ static struct TokenInfo setup_info_graphics[] = static struct TokenInfo setup_info_sound[] = { - { TYPE_SWITCH, &setup.sound_simple, "Simple Sound:" }, - { TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" }, - { TYPE_SWITCH, &setup.sound_music, "Game Music:" }, + { TYPE_SWITCH, &setup.sound_simple, "Sound Effects (Normal):" }, + { TYPE_SWITCH, &setup.sound_loops, "Sound Effects (Looping):" }, + { TYPE_SWITCH, &setup.sound_music, "Music:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -2010,26 +2165,51 @@ static struct TokenInfo setup_info_artwork[] = { TYPE_ENTER_MENU, execSetupChooseMusic, "Custom Music" }, { TYPE_STRING, &music_set_name, "" }, { TYPE_EMPTY, NULL, "" }, +#if 1 + { TYPE_YES_NO, &setup.override_level_graphics,"Override Level Graphics:" }, + { TYPE_YES_NO, &setup.override_level_sounds, "Override Level Sounds:" }, + { TYPE_YES_NO, &setup.override_level_music, "Override Level Music:" }, +#else { 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:" }, +#endif { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } }; -static struct TokenInfo setup_info_shortcut[] = +static struct TokenInfo setup_info_shortcut_1[] = { - { TYPE_KEYTEXT, NULL, "Quick Save Game:", }, - { 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_KEYTEXT, NULL, "Quick Save Game to Tape:", }, + { TYPE_KEY, &setup.shortcut.save_game, "" }, + { TYPE_KEYTEXT, NULL, "Quick Load Game from Tape:", }, + { TYPE_KEY, &setup.shortcut.load_game, "" }, + { TYPE_KEYTEXT, NULL, "Start Game & Toggle Pause:", }, + { TYPE_KEY, &setup.shortcut.toggle_pause, "" }, { TYPE_EMPTY, NULL, "" }, - { TYPE_YES_NO, &setup.ask_on_escape, "Ask on Esc:" }, + { TYPE_YES_NO, &setup.ask_on_escape, "Ask on 'Esc' Key:" }, + { TYPE_YES_NO, &setup.ask_on_escape_editor, "Ask on 'Esc' Key (Editor):" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } +}; + +static struct TokenInfo setup_info_shortcut_2[] = +{ + { TYPE_KEYTEXT, NULL, "Set Focus to Player 1:", }, + { TYPE_KEY, &setup.shortcut.focus_player[0], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to Player 2:", }, + { TYPE_KEY, &setup.shortcut.focus_player[1], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to Player 3:", }, + { TYPE_KEY, &setup.shortcut.focus_player[2], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to Player 4:", }, + { TYPE_KEY, &setup.shortcut.focus_player[3], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to All Players:", }, + { TYPE_KEY, &setup.shortcut.focus_player_all, "" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -2088,17 +2268,22 @@ static void drawSetupValue(int pos) int xpos = MENU_SCREEN_VALUE_XPOS; int ypos = MENU_SCREEN_START_YPOS + pos; int font_nr = FONT_VALUE_1; + int font_width = getFontWidth(font_nr); int type = setup_info[pos].type; void *value = setup_info[pos].value; - char *value_string = (!(type & TYPE_GHOSTED) ? getSetupValue(type, value) : - "n/a"); + char *value_string = getSetupValue(type, value); + int i; if (value_string == NULL) return; if (type & TYPE_KEY) { +#if 1 + xpos = 1; +#else xpos = 3; +#endif if (type & TYPE_QUERY) { @@ -2116,13 +2301,28 @@ static void drawSetupValue(int pos) if (strlen(value_string) > max_value_len) value_string[max_value_len] = '\0'; } + else if (type & TYPE_ECS_AGA) + { + font_nr = FONT_VALUE_1; + } else if (type & TYPE_BOOLEAN_STYLE) { font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF); } +#if 1 + for (i = 0; i <= MENU_SCREEN_MAX_XPOS - xpos; i++) + DrawText(mSX + xpos * 32 + i * font_width, mSY + ypos * 32, " ", font_nr); +#else +#if 1 + for (i = xpos; i <= MENU_SCREEN_MAX_XPOS; i++) + DrawText(mSX + i * 32, mSY + ypos * 32, " ", font_nr); +#else DrawText(mSX + xpos * 32, mSY + ypos * 32, (xpos == 3 ? " " : " "), font_nr); +#endif +#endif + DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr); } @@ -2188,13 +2388,22 @@ static void DrawSetupScreen_Generic() setup_info = setup_info_artwork; title_string = "Custom Artwork"; } - else if (setup_mode == SETUP_MODE_SHORTCUT) + else if (setup_mode == SETUP_MODE_SHORTCUT_1) { - setup_info = setup_info_shortcut; + setup_info = setup_info_shortcut_1; + title_string = "Setup Shortcuts"; + } + else if (setup_mode == SETUP_MODE_SHORTCUT_2) + { + setup_info = setup_info_shortcut_2; title_string = "Setup Shortcuts"; } +#if 1 + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); +#else DrawText(mSX + 16, mSY + 16, title_string, FONT_TITLE_1); +#endif num_setup_info = 0; for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) @@ -2210,9 +2419,12 @@ static void DrawSetupScreen_Generic() (value_ptr == &setup.fullscreen && !video.fullscreen_available)) setup_info[i].type |= TYPE_GHOSTED; -#if 0 - if (setup_info[i].type & TYPE_STRING || - (setup_info[i].type & TYPE_SWITCH && setup_mode == SETUP_MODE_EDITOR)) +#if 1 + if (setup_info[i].type & (TYPE_SWITCH | + TYPE_YES_NO | + TYPE_STRING | + TYPE_ECS_AGA | + TYPE_KEYTEXT)) font_nr = FONT_MENU_2; #else if (setup_info[i].type & TYPE_STRING) @@ -2222,9 +2434,9 @@ static void DrawSetupScreen_Generic() DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr); if (setup_info[i].type & TYPE_ENTER_MENU) - initCursor(i, IMG_MENU_BUTTON_RIGHT); + initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); else if (setup_info[i].type & TYPE_LEAVE_MENU) - initCursor(i, IMG_MENU_BUTTON_LEFT); + initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) initCursor(i, IMG_MENU_BUTTON); @@ -2234,6 +2446,11 @@ static void DrawSetupScreen_Generic() num_setup_info++; } +#if 0 + DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, + "Joysticks deactivated in setup menu"); +#endif + FadeToFront(); InitAnimation(); HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); @@ -2334,22 +2551,28 @@ void DrawSetupScreen_Input() { ClearWindow(); - DrawText(mSX+16, mSY+16, "Setup Input", FONT_TITLE_1); +#if 1 + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input"); +#else + DrawText(mSX + 16, mSY + 16, "Setup Input", FONT_TITLE_1); +#endif - initCursor(0, IMG_MENU_BUTTON); - initCursor(1, IMG_MENU_BUTTON); - initCursor(2, IMG_MENU_BUTTON_RIGHT); - initCursor(13, IMG_MENU_BUTTON_LEFT); + initCursor(0, IMG_MENU_BUTTON); + initCursor(1, IMG_MENU_BUTTON); + initCursor(2, IMG_MENU_BUTTON_ENTER_MENU); + initCursor(13, IMG_MENU_BUTTON_LEAVE_MENU); drawCursorXY(10, 0, IMG_MENU_BUTTON_LEFT); drawCursorXY(12, 0, IMG_MENU_BUTTON_RIGHT); - DrawText(mSX+32, mSY+2*32, "Player:", FONT_MENU_1); - DrawText(mSX+32, mSY+3*32, "Device:", FONT_MENU_1); - DrawText(mSX+32, mSY+15*32, "Back", FONT_MENU_1); + DrawText(mSX + 32, mSY + 2 * 32, "Player:", FONT_MENU_1); + DrawText(mSX + 32, mSY + 3 * 32, "Device:", FONT_MENU_1); + DrawText(mSX + 32, mSY + 15 * 32, "Back", FONT_MENU_1); #if 0 DeactivateJoystickForCalibration(); +#endif +#if 1 DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, "Joysticks deactivated on this screen"); #endif @@ -2405,50 +2628,52 @@ static void drawPlayerSetupInputInfo(int player_nr) "Joystick4" }; + InitJoysticks(); + custom_key = setup.input[player_nr].key; - DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE); -#if 1 + DrawText(mSX + 11 * 32, mSY + 2 * 32, int2str(player_nr + 1, 1), + FONT_INPUT_1_ACTIVE); + + ClearRectangleOnBackground(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY, + TILEX, TILEY); DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0); -#else - DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0); -#endif if (setup.input[player_nr].use_joystick) { char *device_name = setup.input[player_nr].joy.device_name; + char *text = joystick_name[getJoystickNrFromDeviceName(device_name)]; + int font_nr = (joystick.fd[player_nr] < 0 ? FONT_VALUE_OLD : FONT_VALUE_1); - DrawText(mSX+8*32, mSY+3*32, - joystick_name[getJoystickNrFromDeviceName(device_name)], - FONT_VALUE_1); - DrawText(mSX+32, mSY+4*32, "Calibrate", FONT_MENU_1); + DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr); + DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", FONT_MENU_1); } else { - DrawText(mSX+8*32, mSY+3*32, "Keyboard ", FONT_VALUE_1); - DrawText(mSX+32, mSY+4*32, "Customize", FONT_MENU_1); + DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1); + DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", FONT_MENU_1); } - DrawText(mSX+32, mSY+5*32, "Actual Settings:", FONT_MENU_1); + DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1); drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT); drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT); drawCursorXY(1, 6, IMG_MENU_BUTTON_UP); drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN); - DrawText(mSX+2*32, mSY+6*32, ":", FONT_VALUE_OLD); - DrawText(mSX+2*32, mSY+7*32, ":", FONT_VALUE_OLD); - DrawText(mSX+2*32, mSY+8*32, ":", FONT_VALUE_OLD); - DrawText(mSX+2*32, mSY+9*32, ":", FONT_VALUE_OLD); - DrawText(mSX+32, mSY+10*32, "Snap Field:", FONT_VALUE_OLD); - DrawText(mSX+32, mSY+12*32, "Drop Element:", FONT_VALUE_OLD); + DrawText(mSX + 2 * 32, mSY + 6 * 32, ":", FONT_VALUE_OLD); + DrawText(mSX + 2 * 32, mSY + 7 * 32, ":", FONT_VALUE_OLD); + DrawText(mSX + 2 * 32, mSY + 8 * 32, ":", FONT_VALUE_OLD); + DrawText(mSX + 2 * 32, mSY + 9 * 32, ":", FONT_VALUE_OLD); + DrawText(mSX + 1 * 32, mSY + 10 * 32, "Snap Field:", FONT_VALUE_OLD); + DrawText(mSX + 1 * 32, mSY + 12 * 32, "Drop Element:", FONT_VALUE_OLD); for (i = 0; i < 6; i++) { int ypos = 6 + i + (i > 3 ? i-3 : 0); - DrawText(mSX + 3*32, mSY + ypos*32, + DrawText(mSX + 3 * 32, mSY + ypos * 32, " ", FONT_VALUE_1); - DrawText(mSX + 3*32, mSY + ypos*32, + DrawText(mSX + 3 * 32, mSY + ypos * 32, (setup.input[player_nr].use_joystick ? custom[i].text : getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1); @@ -2598,17 +2823,22 @@ void CustomizeKeyboard(int player_nr) custom_key = setup.input[player_nr].key; ClearWindow(); + +#if 1 + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Keyboard Input"); +#else DrawText(mSX + 16, mSY + 16, "Keyboard Input", FONT_TITLE_1); +#endif BackToFront(); InitAnimation(); step_nr = 0; - DrawText(mSX, mSY + (2+2*step_nr)*32, + DrawText(mSX, mSY + (2 + 2 * step_nr) * 32, customize_step[step_nr].text, FONT_INPUT_1_ACTIVE); - DrawText(mSX, mSY + (2+2*step_nr+1)*32, + DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32, "Key:", FONT_INPUT_1_ACTIVE); - DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32, + DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32, getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD); while (!finished) @@ -2648,32 +2878,32 @@ void CustomizeKeyboard(int player_nr) /* got new key binding */ *customize_step[step_nr].key = key; - DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32, + DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32, " ", FONT_VALUE_1); - DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32, + DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32, getKeyNameFromKey(key), FONT_VALUE_1); step_nr++; /* un-highlight last query */ - DrawText(mSX, mSY+(2+2*(step_nr-1))*32, - customize_step[step_nr-1].text, FONT_MENU_1); - DrawText(mSX, mSY+(2+2*(step_nr-1)+1)*32, + DrawText(mSX, mSY + (2 + 2 * (step_nr - 1)) * 32, + customize_step[step_nr - 1].text, FONT_MENU_1); + DrawText(mSX, mSY + (2 + 2 * (step_nr - 1) + 1) * 32, "Key:", FONT_MENU_1); /* press 'Enter' to leave */ if (step_nr == 6) { - DrawText(mSX + 16, mSY + 15*32+16, + DrawText(mSX + 16, mSY + 15 * 32 + 16, "Press Enter", FONT_TITLE_1); break; } /* query next key binding */ - DrawText(mSX, mSY+(2+2*step_nr)*32, + DrawText(mSX, mSY + (2 + 2 * step_nr) * 32, customize_step[step_nr].text, FONT_INPUT_1_ACTIVE); - DrawText(mSX, mSY+(2+2*step_nr+1)*32, + DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32, "Key:", FONT_INPUT_1_ACTIVE); - DrawText(mSX + 4*32, mSY+(2+2*step_nr+1)*32, + DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32, getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD); } @@ -2736,13 +2966,13 @@ static boolean CalibrateJoystickMain(int player_nr) } } - DrawText(mSX, mSY + 6 * 32, " ROTATE JOYSTICK ", FONT_TITLE_1); - DrawText(mSX, mSY + 7 * 32, "IN ALL DIRECTIONS", FONT_TITLE_1); - DrawText(mSX + 16, mSY + 9 * 32, " IF ALL BALLS ", FONT_TITLE_1); - DrawText(mSX, mSY + 10 * 32, " ARE YELLOW, ", FONT_TITLE_1); - DrawText(mSX, mSY + 11 * 32, " CENTER JOYSTICK ", FONT_TITLE_1); - DrawText(mSX, mSY + 12 * 32, " AND ", FONT_TITLE_1); - DrawText(mSX, mSY + 13 * 32, "PRESS ANY BUTTON!", FONT_TITLE_1); + DrawTextSCentered(mSY - SY + 6 * 32, FONT_TITLE_1, "Rotate joystick"); + DrawTextSCentered(mSY - SY + 7 * 32, FONT_TITLE_1, "in all directions"); + DrawTextSCentered(mSY - SY + 9 * 32, FONT_TITLE_1, "if all balls"); + DrawTextSCentered(mSY - SY + 10 * 32, FONT_TITLE_1, "are marked,"); + DrawTextSCentered(mSY - SY + 11 * 32, FONT_TITLE_1, "center joystick"); + DrawTextSCentered(mSY - SY + 12 * 32, FONT_TITLE_1, "and"); + DrawTextSCentered(mSY - SY + 13 * 32, FONT_TITLE_1, "press any button!"); joy_value = Joystick(player_nr); last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0); @@ -2868,7 +3098,9 @@ static boolean CalibrateJoystickMain(int player_nr) StopAnimation(); +#if 0 DrawSetupScreen_Input(); +#endif /* wait until the last pressed button was released */ while (Joystick(player_nr) & JOY_BUTTON) @@ -2891,13 +3123,25 @@ void CalibrateJoystick(int player_nr) { if (!CalibrateJoystickMain(player_nr)) { + char *device_name = setup.input[player_nr].joy.device_name; + int nr = getJoystickNrFromDeviceName(device_name) + 1; + int xpos = mSX - SX; + int ypos = mSY - SY; + ClearWindow(); - DrawText(mSX + 16, mSY + 6 * 32, " JOYSTICK NOT ", FONT_TITLE_1); - DrawText(mSX, mSY + 7 * 32, " AVAILABLE ", FONT_TITLE_1); + DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, " JOYSTICK %d ", nr); + DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, " NOT AVAILABLE! "); BackToFront(); - Delay(2000); /* show error message for two seconds */ + + Delay(2000); /* show error message for a short time */ + + ClearEventQueue(); } + +#if 1 + DrawSetupScreen_Input(); +#endif } void DrawSetupScreen() @@ -2942,14 +3186,7 @@ void HandleGameActions() if (game_status != GAME_MODE_PLAYING) return; - if (local_player->LevelSolved) - GameWon(); - - if (AllPlayersGone && !TAPE_IS_STOPPED(tape)) - TapeStop(); - - GameActions(); - BackToFront(); + GameActions(); /* main game loop */ if (tape.auto_play && !tape.playing) AutoPlayTape(); /* continue automatically playing next tape */