X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=39650b5cf6a4f9aa32acd0fb999518ccbd6815c1;hp=6838dc9540ab8b3ec1e695091e7690c12a32eee8;hb=668d05fbdb883eb630700f4df445f77abe599498;hpb=438a173a61e0b6b62a5dbdda881e9c920df17165 diff --git a/src/screens.c b/src/screens.c index 6838dc95..39650b5c 100644 --- a/src/screens.c +++ b/src/screens.c @@ -123,6 +123,10 @@ #define STR_SETUP_CHOOSE_GRID_XSIZE_1 "Horiz. Buttons" #define STR_SETUP_CHOOSE_GRID_YSIZE_1 "Vert. Buttons" +// other screen text constants +#define STR_CHOOSE_TREE_EDIT "Edit" +#define MENU_CHOOSE_TREE_FONT(x) (FONT_TEXT_1 + (x)) + // for input setup functions #define SETUPINPUT_SCREEN_POS_START 0 #define SETUPINPUT_SCREEN_POS_EMPTY1 3 @@ -138,6 +142,7 @@ #define MENU_SCREEN_START_XPOS 1 #define MENU_SCREEN_START_YPOS 2 #define MENU_SCREEN_VALUE_XPOS (SCR_FIELDX - 3) +#define MENU_SCREEN_TEXT2_XPOS (SCR_FIELDX - 2) #define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) #define MENU_TITLE1_YPOS 8 #define MENU_TITLE2_YPOS 46 @@ -248,10 +253,12 @@ static void execSetupTouch(void); static void execSetupArtwork(void); static void HandleChooseTree(int, int, int, int, int, TreeInfo **); +static void DrawChoosePlayerName(void); static void DrawChooseLevelSet(void); static void DrawChooseLevelNr(void); static void DrawInfoScreen(void); static void DrawSetupScreen(void); +static void DrawTypeName(void); static void DrawInfoScreen_NotAvailable(char *, char *); static void DrawInfoScreen_HelpAnim(int, int, boolean); @@ -326,6 +333,9 @@ static TreeInfo *transparency_current = NULL; static TreeInfo *grid_sizes[2][2] = { { NULL, NULL }, { NULL, NULL } }; static TreeInfo *grid_size_current[2][2] = { { NULL, NULL }, { NULL, NULL } }; +static TreeInfo *player_name = NULL; +static TreeInfo *player_name_current = NULL; + static TreeInfo *level_number = NULL; static TreeInfo *level_number_current = NULL; @@ -540,7 +550,9 @@ static int align_yoffset = 0; #define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \ (s) <= GAME_MODE_SETUP ? (s) : \ (s) == GAME_MODE_PSEUDO_TYPENAME ? \ - GAME_MODE_MAIN : GAME_MODE_DEFAULT) + GAME_MODE_MAIN : \ + (s) == GAME_MODE_PSEUDO_TYPENAMES ? \ + GAME_MODE_NAMES : GAME_MODE_DEFAULT) // (there are no draw offset definitions needed for INFO_MODE_TITLE) #define DRAW_MODE_INFO(i) ((i) >= INFO_MODE_TITLE && \ @@ -680,6 +692,8 @@ static char *main_text_title_1 = NULL; static char *main_text_title_2 = NULL; static char *main_text_title_3 = NULL; +extern char debug_xsn_mode[]; + struct MainControlInfo { int nr; @@ -1421,6 +1435,40 @@ static void drawChooseTreeCursor(int ypos, boolean active) drawCursorExt(0, ypos, active, -1); } +static int getChooseTreeEditFont(boolean active) +{ + return (active ? FONT_MENU_2_ACTIVE : FONT_MENU_2); +} + +static int getChooseTreeEditXPos(int pos) +{ + boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped; + int xoffset = (has_scrollbar ? -1 : 0); + int xpos = MENU_SCREEN_TEXT2_XPOS + xoffset; + int sx = amSX + xpos * TILEX; + int font_nr = getChooseTreeEditFont(FALSE); + int width = getTextWidth(STR_CHOOSE_TREE_EDIT, font_nr); + + return (pos == POS_RIGHT ? sx + width - 1 : sx); +} + +static int getChooseTreeEditYPos(int ypos_raw) +{ + int ypos = MENU_SCREEN_START_YPOS + ypos_raw; + int sy = amSY + ypos * TILEY; + + return sy; +} + +static void drawChooseTreeEdit(int ypos_raw, boolean active) +{ + int sx = getChooseTreeEditXPos(POS_LEFT); + int sy = getChooseTreeEditYPos(ypos_raw); + int font_nr = getChooseTreeEditFont(active); + + DrawText(sx, sy, STR_CHOOSE_TREE_EDIT, font_nr); +} + static void DrawHeadline(void) { DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, main_text_title_1); @@ -1698,7 +1746,7 @@ static void gotoTopLevelDir(void) if (leveldir_current->node_parent->node_group->cl_first == -1) { int num_leveldirs = numTreeInfoInGroup(leveldir_current); - int leveldir_pos = posTreeInfo(leveldir_current); + int leveldir_pos = getPosFromTreeInfo(leveldir_current); int num_page_entries = MIN(num_leveldirs, NUM_MENU_ENTRIES_ON_SCREEN); int cl_first, cl_cursor; @@ -2076,9 +2124,20 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else { - SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + if (setup.multiple_users) + { + CloseDoor(DOOR_CLOSE_2); - HandleTypeName(strlen(setup.player_name), 0); + SetGameStatus(GAME_MODE_NAMES); + + DrawChoosePlayerName(); + } + else + { + SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + + DrawTypeName(); + } } } else if (pos == MAIN_CONTROL_LEVELS) @@ -2109,10 +2168,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) else if (pos == MAIN_CONTROL_EDITOR) { if (leveldir_current->readonly && - !strEqual(setup.player_name, "Artsoft")) - Request("This level is read only!", REQ_CONFIRM); + setup.editor.show_read_only_warning) + Request("This level is read-only!", REQ_CONFIRM | REQ_STAY_OPEN); - CloseDoor(DOOR_CLOSE_2); + CloseDoor(DOOR_CLOSE_ALL); SetGameStatus(GAME_MODE_EDITOR); @@ -3958,80 +4017,279 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) // type name functions // ============================================================================ -void HandleTypeName(int newxpos, Key key) +static TreeInfo *type_name_node = NULL; +static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 }; +static int type_name_nr = 0; + +static int getPlayerNameColor(char *name) +{ + return (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED); +} + +static void drawTypeNameText(char *name, struct TextPosInfo *pos, + boolean active) +{ + char text[MAX_PLAYER_NAME_LEN + 2] = { 0 }; + boolean multiple_users = (game_status == GAME_MODE_PSEUDO_TYPENAMES); + int sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos)); + int sy = (multiple_users ? amSY + pos->y : mSY + ALIGNED_TEXT_YPOS(pos)); + int font_nr = (active ? FONT_ACTIVE(pos->font) : pos->font); + int font_width = getFontWidth(font_nr); + + DrawBackgroundForFont(sx, sy, pos->width, pos->height, font_nr); + + sprintf(text, "%s%c", name, (active ? '_' : '\0')); + + pos->width = strlen(text) * font_width; + sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos)); + + DrawText(sx, sy, text, font_nr); +} + +static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos) { - static char last_player_name[MAX_PLAYER_NAME_LEN + 1]; struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME); - struct TextPosInfo *pos = mci->pos_input; - int startx = mSX + ALIGNED_TEXT_XPOS(pos); - int starty = mSY + ALIGNED_TEXT_YPOS(pos); - static int xpos = 0; - int font_nr = pos->font; - int font_active_nr = FONT_ACTIVE(font_nr); - int font_width = getFontWidth(font_active_nr); - char key_char = getValidConfigValueChar(getCharFromKey(key)); - boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0)); - boolean is_active = TRUE; - DrawBackgroundForFont(startx,starty, pos->width, pos->height, font_active_nr); + *pos = *mci->pos_input; - if (newxpos) + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { - strcpy(last_player_name, setup.player_name); + TreeInfo *ti = player_name_current; + int first_entry = ti->cl_first; + int entry_pos = first_entry + ti->cl_cursor; + TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti); + int xpos = MENU_SCREEN_START_XPOS; + int ypos = MENU_SCREEN_START_YPOS + ti->cl_cursor; + + type_name_node = getTreeInfoFromPos(node_first, entry_pos); + type_name_nr = entry_pos; - xpos = newxpos; + strcpy(name, type_name_node->name); - StartTextInput(startx, starty, pos->width, pos->height); + pos->x = xpos * 32; + pos->y = ypos * 32; + pos->width = MAX_PLAYER_NAME_LEN * 32; } - else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) + else { - setup.player_name[xpos] = key_char; - setup.player_name[xpos + 1] = 0; + type_name_nr = user.nr; - xpos++; + strcpy(name, setup.player_name); } - else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0) + + strcpy(type_name_last, name); + + if (strEqual(name, EMPTY_PLAYER_NAME)) + strcpy(name, ""); + + *xpos = strlen(name); +} + +static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos) +{ + // change name of edited user in global list of user names + setString(&global.user_names[type_name_nr], name); + + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { - xpos--; + TreeInfo *node = type_name_node; + + // change name of edited user in local menu tree structure + setString(&node->name, name); + setString(&node->name_sorting, name); - setup.player_name[xpos] = 0; + node->color = getPlayerNameColor(name); + pos->font = MENU_CHOOSE_TREE_FONT(node->color); } - else if (key == KSYM_Return && xpos > 0) +} + +static void setTypeNameValues(char *name, struct TextPosInfo *pos, + boolean changed) +{ + boolean reset_setup = strEqual(name, ""); + boolean remove_user = strEqual(name, EMPTY_PLAYER_NAME); + boolean create_user = strEqual(type_name_last, EMPTY_PLAYER_NAME); + + if (!changed) + strcpy(name, type_name_last); + + if (strEqual(name, "")) + strcpy(name, EMPTY_PLAYER_NAME); + + setTypeNameValues_Name(name, pos); + + // if player name not changed, no further action required + if (strEqual(name, type_name_last)) + return; + + // redraw player name before (possibly) opening request dialogs + drawTypeNameText(name, pos, FALSE); + + int last_user_nr = user.nr; + + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { + // save setup of currently active user (may differ from edited user) SaveSetup(); - is_active = FALSE; + // temporarily change active user to edited user + user.nr = type_name_nr; - SetGameStatus(GAME_MODE_MAIN); + // load setup of edited user (unless creating user with current setup) + if (!create_user || + !Request("Use current setup values for the new player?", REQ_ASK)) + LoadSetup(); } - else if (key == KSYM_Escape) + + char *setup_filename = getSetupFilename(); + boolean setup_exists = fileExists(setup_filename); + + // change name of edited user in setup structure + strcpy(setup.player_name, name); + + // save setup of edited user + SaveSetup(); + + if (game_status == GAME_MODE_PSEUDO_TYPENAMES || reset_setup) { - strcpy(setup.player_name, last_player_name); + if (reset_setup) + { + if (Request("Reset setup values for this player?", REQ_ASK)) + { + // remove setup config file + unlink(setup_filename); - is_active = FALSE; + // set player name to default player name + LoadSetup(); - SetGameStatus(GAME_MODE_MAIN); + // update player name used by name typing functions + strcpy(name, setup.player_name); + + setTypeNameValues_Name(name, pos); + } + } + else if (remove_user && type_name_nr != 0) + { + if (Request("Remove settings and tapes for deleted player?", REQ_ASK)) + { + char *user_dir = getUserGameDataDir(); + char *user_dir_removed = + getStringCat3WithSeparator(user_dir, "REMOVED", + getCurrentTimestamp(), "."); + + if (rename(user_dir, user_dir_removed) != 0) + Request("Removing settings and tapes failed!", REQ_CONFIRM); + + checked_free(user_dir_removed); + } + } + else if (create_user && type_name_nr != 0 && !setup_exists) + { + if (Request("Create empty level set for the new player?", REQ_ASK)) + { + char *levelset_subdir = getNewUserLevelSubdir(); + + if (CreateUserLevelSet(levelset_subdir, name, name, 100, FALSE)) + { + AddUserLevelSetToLevelInfo(levelset_subdir); + + LevelDirTree *leveldir_current_last = leveldir_current; + + leveldir_current = getTreeInfoFromIdentifier(leveldir_first, + levelset_subdir); + + // set level number of newly created level set to default value + LoadLevelSetup_SeriesInfo(); + + // set newly created level set as current level set for new user + SaveLevelSetup_LastSeries(); + SaveLevelSetup_SeriesInfo(); + + leveldir_current = leveldir_current_last; + } + else + { + Request("Creating new level set failed!", REQ_CONFIRM); + } + } + } + + // restore currently active user + user.nr = last_user_nr; + + // restore setup of currently active user + LoadSetup(); + + // restore last level set of currently active user + LoadLevelSetup_LastSeries(); + LoadLevelSetup_SeriesInfo(); } +} - if (is_active) +static void HandleTypeNameExt(boolean initialize, Key key) +{ + static struct TextPosInfo pos_name = { 0 }; + static char name[MAX_PLAYER_NAME_LEN + 1] = { 0 }; + static int xpos = 0; + struct TextPosInfo *pos = &pos_name; + char key_char = getValidConfigValueChar(getCharFromKey(key)); + boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0)); + boolean active = TRUE; + + if (initialize) { - pos->width = (strlen(setup.player_name) + 1) * font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); + getTypeNameValues(name, pos, &xpos); + + int sx = mSX + ALIGNED_TEXT_XPOS(pos); + int sy = mSY + ALIGNED_TEXT_YPOS(pos); - DrawText(startx, starty, setup.player_name, font_active_nr); - DrawText(startx + xpos * font_width, starty, "_", font_active_nr); + StartTextInput(sx, sy, pos->width, pos->height); } - else + else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) { - pos->width = strlen(setup.player_name) * font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); + name[xpos] = key_char; + name[xpos + 1] = 0; - DrawText(startx, starty, setup.player_name, font_nr); + xpos++; + } + else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0) + { + xpos--; + + name[xpos] = 0; + } + else if (key == KSYM_Return || key == KSYM_Escape) + { + boolean changed = (key == KSYM_Return); StopTextInput(); + + setTypeNameValues(name, pos, changed); + + active = FALSE; + } + + drawTypeNameText(name, pos, active); + + if (!active) + { + SetGameStatus(game_status_last_screen); + + if (game_status == GAME_MODE_MAIN) + InitializeMainControls(); } } +static void DrawTypeName(void) +{ + HandleTypeNameExt(TRUE, 0); +} + +void HandleTypeName(Key key) +{ + HandleTypeNameExt(FALSE, key); +} + // ============================================================================ // tree menu functions @@ -4051,7 +4309,8 @@ static int getAlignXOffsetFromTreeInfo(TreeInfo *ti) int num_entries = numTreeInfoInGroup(ti); boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN); - int text_width = max_text_size * getFontWidth(FONT_TEXT_1); + int font_nr = MENU_CHOOSE_TREE_FONT(FC_RED); + int text_width = max_text_size * getFontWidth(font_nr); int button_width = SC_MENUBUTTON_XSIZE; int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE); @@ -4071,7 +4330,8 @@ static int getAlignYOffsetFromTreeInfo(TreeInfo *ti) int num_entries = numTreeInfoInGroup(ti); int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN); - int font_height = getFontHeight(FONT_TEXT_1); + int font_nr = MENU_CHOOSE_TREE_FONT(FC_RED); + int font_height = getFontHeight(font_nr); int text_height = font_height * num_page_entries; int page_height = font_height * NUM_MENU_ENTRIES_ON_SCREEN; int align = menu.list_setup[SETUP_MODE_CHOOSE_OTHER].valign; @@ -4108,7 +4368,9 @@ static void DrawChooseTree(TreeInfo **ti_ptr) // needed if different viewport properties defined for choosing level (set) ChangeViewportPropertiesIfNeeded(); - if (game_status == GAME_MODE_LEVELNR) + if (game_status == GAME_MODE_NAMES) + SetMainBackgroundImage(IMG_BACKGROUND_NAMES); + else if (game_status == GAME_MODE_LEVELNR) SetMainBackgroundImage(IMG_BACKGROUND_LEVELNR); else if (game_status == GAME_MODE_LEVELS) SetMainBackgroundImage(IMG_BACKGROUND_LEVELS); @@ -4117,8 +4379,8 @@ static void DrawChooseTree(TreeInfo **ti_ptr) OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); MapScreenTreeGadgets(*ti_ptr); + HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); DrawMaskedBorder(fade_mask); @@ -4132,8 +4394,6 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN); int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE); - int font_nr = FONT_TEXT_1; - int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; int i; char *title_string = NULL; int yoffset_sets = MENU_TITLE1_YPOS; @@ -4151,6 +4411,12 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, { TreeInfo *node, *node_first; int entry_pos = first_entry + i; + + node_first = getTreeInfoFirstGroupEntry(ti); + node = getTreeInfoFromPos(node_first, entry_pos); + + int font_nr = MENU_CHOOSE_TREE_FONT(node->color); + int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; int xpos = MENU_SCREEN_START_XPOS; int ypos = MENU_SCREEN_START_YPOS + i; int startx = amSX + xpos * 32; @@ -4161,13 +4427,10 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, int max_buffer_len = max_text_size / getFontWidth(font_nr); char buffer[max_buffer_len + 1]; - node_first = getTreeInfoFirstGroupEntry(ti); - node = getTreeInfoFromPos(node_first, entry_pos); - strncpy(buffer, node->name, max_buffer_len); buffer[max_buffer_len] = '\0'; - DrawText(startx, starty, buffer, font_nr + node->color); + DrawText(startx, starty, buffer, font_nr); if (node->parent_link) initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); @@ -4175,6 +4438,9 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); else initCursor(i, IMG_MENU_BUTTON); + + if (game_status == GAME_MODE_NAMES) + drawChooseTreeEdit(i, FALSE); } redraw_mask |= REDRAW_FIELD; @@ -4222,6 +4488,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped; int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x; int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE); + int sx1_edit_name = getChooseTreeEditXPos(POS_LEFT); + int sx2_edit_name = getChooseTreeEditXPos(POS_RIGHT); int x = 0; int y = ti->cl_cursor; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); @@ -4232,7 +4500,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (button == MB_MENU_INITIALIZE) { int num_entries = numTreeInfoInGroup(ti); - int entry_pos = posTreeInfo(ti); + int entry_pos = getPosFromTreeInfo(ti); align_xoffset = getAlignXOffsetFromTreeInfo(ti); align_yoffset = getAlignYOffsetFromTreeInfo(ti); @@ -4323,6 +4591,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { x = (mx - amSX) / 32; y = (my - amSY) / 32 - MENU_SCREEN_START_YPOS; + + if (game_status == GAME_MODE_NAMES) + drawChooseTreeEdit(ti->cl_cursor, FALSE); } else if (dx || dy) // keyboard or scrollbar/scrollbutton input { @@ -4421,6 +4692,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (button) { + if (game_status == GAME_MODE_NAMES) + { + if (mx >= sx1_edit_name && mx <= sx2_edit_name) + drawChooseTreeEdit(y, TRUE); + } + if (y != ti->cl_cursor) { PlaySound(SND_MENU_ITEM_ACTIVATING); @@ -4540,6 +4817,39 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, HandleMainMenu_SelectLevel(0, 0, new_level_nr); } + else if (game_status == GAME_MODE_NAMES) + { + if (mx >= sx1_edit_name && mx <= sx2_edit_name) + { + SetGameStatus(GAME_MODE_PSEUDO_TYPENAMES); + + DrawTypeName(); + + return; + } + + // change active user to selected user + user.nr = entry_pos; + + // save number of new active user + SaveUserSetup(); + + // load setup of new active user + LoadSetup(); + + // load last level set of new active user + LoadLevelSetup_LastSeries(); + LoadLevelSetup_SeriesInfo(); + + TapeErase(); + + ToggleFullscreenIfNeeded(); + ChangeWindowScalingIfNeeded(); + + ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_GRAPHICS); + ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_SOUNDS); + ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_MUSIC); + } SetGameStatus(GAME_MODE_MAIN); @@ -4550,6 +4860,60 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } } +void DrawChoosePlayerName(void) +{ + int i; + + FadeMenuSoundsAndMusic(); + + if (player_name != NULL) + { + freeTreeInfo(player_name); + + player_name = NULL; + } + + for (i = 0; i < MAX_PLAYER_NAMES; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_PLAYER_NAME); + char identifier[32], name[MAX_PLAYER_NAME_LEN + 1]; + int value = i; + + ti->node_top = &player_name; + ti->sort_priority = 10000 + value; + ti->color = getPlayerNameColor(global.user_names[i]); + + snprintf(identifier, sizeof(identifier), "%d", value); + snprintf(name, sizeof(name), "%s", global.user_names[i]); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + + pushTreeInfo(&player_name, ti); + } + + // sort player entries by player number + sortTreeInfo(&player_name); + + // set current player entry to selected player entry + player_name_current = + getTreeInfoFromIdentifier(player_name, i_to_a(user.nr)); + + // if that fails, set current player name to first available name + if (player_name_current == NULL) + player_name_current = player_name; + + DrawChooseTree(&player_name_current); + + PlayMenuSoundsAndMusic(); +} + +void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button) +{ + HandleChooseTree(mx, my, dx, dy, button, &player_name_current); +} + void DrawChooseLevelSet(void) { FadeMenuSoundsAndMusic(); @@ -4716,9 +5080,15 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) if (button == MB_MENU_INITIALIZE) { level_nr = mx; - first_entry = 0; highlight_position = my; + first_entry = highlight_position - (NUM_MENU_ENTRIES_ON_SCREEN + 1) / 2 + 1; + + if (first_entry < 0) + first_entry = 0; + else if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES) + first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN); + drawHallOfFameList(level_nr, first_entry, highlight_position); return; @@ -6294,6 +6664,7 @@ static struct TokenInfo setup_info_game[] = { TYPE_PLAYER, &setup.network_player_nr,"Preferred Network Player:" }, { TYPE_TEXT_INPUT, execGadgetNetworkServer, "Network Server Hostname:" }, { TYPE_STRING, &network_server_text, "" }, + { TYPE_SWITCH, &setup.multiple_users, "Multiple Users/Teams:" }, { TYPE_YES_NO, &setup.input_on_focus, "Only Move Focussed Player:" }, { TYPE_SWITCH, &setup.time_limit, "Time Limit:" }, { TYPE_SWITCH, &setup.handicap, "Handicap:" }, @@ -6325,6 +6696,7 @@ static struct TokenInfo setup_info_engines[] = { TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" }, { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" }, { TYPE_SWITCH, &setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" }, + { TYPE_SWITCH, &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_HEADLINE, NULL, "Supaplex" }, { TYPE_SWITCH, &setup.sp_show_border_elements, "Border Elements:" }, @@ -6363,6 +6735,8 @@ static struct TokenInfo setup_info_editor[] = #endif { TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" }, { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" }, + { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } @@ -6391,6 +6765,7 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" }, { TYPE_SWITCH, &setup.toons, "Show Menu Animations:" }, { TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" }, + { TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -6761,6 +7136,10 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) if (startx + font_xoffset < text_startx + text_width + text_font_xoffset) { + // when using narrow font, left-shifting text "auto" not needed + if (type & TYPE_YES_NO_AUTO) + xpos += 1; + xpos += 1; startx = mSX + xpos * 32; @@ -7547,7 +7926,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) Event event; int alpha = 200, alpha_step = -1; int alpha_ticks = 0; - char mapping[4096], temp[4096]; + char mapping[4096], temp[256]; int font_name = MENU_SETUP_FONT_TITLE; int font_info = MENU_SETUP_FONT_TEXT; int spacing_name = menu.line_spacing_setup[SETUP_MODE_INPUT]; @@ -9053,7 +9432,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) break; case SCREEN_CTRL_ID_SCROLL_UP: - if (game_status == GAME_MODE_LEVELS) + if (game_status == GAME_MODE_NAMES) + HandleChoosePlayerName(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); + else if (game_status == GAME_MODE_LEVELS) HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELNR) HandleChooseLevelNr(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); @@ -9064,7 +9445,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) break; case SCREEN_CTRL_ID_SCROLL_DOWN: - if (game_status == GAME_MODE_LEVELS) + if (game_status == GAME_MODE_NAMES) + HandleChoosePlayerName(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); + else if (game_status == GAME_MODE_LEVELS) HandleChooseLevelSet(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELNR) HandleChooseLevelNr(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); @@ -9075,7 +9458,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) break; case SCREEN_CTRL_ID_SCROLL_VERTICAL: - if (game_status == GAME_MODE_LEVELS) + if (game_status == GAME_MODE_NAMES) + HandleChoosePlayerName(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); + else if (game_status == GAME_MODE_LEVELS) HandleChooseLevelSet(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); else if (game_status == GAME_MODE_LEVELNR) HandleChooseLevelNr(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE);