X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=95c953709603bee860dcdebb1166aad83af2120f;hb=222f9f6633633ad0a39c2014d6914866b77cf391;hp=eba14f7ad58b447a601b9c97db3728c3f73a31ad;hpb=522a0df5c166bfcb34156f044cdcc9d194ed56e9;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index eba14f7a..95c95370 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1745,7 +1745,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; @@ -4018,6 +4018,26 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) static TreeInfo *type_name_node = NULL; static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 }; +static int type_name_nr = 0; + +static void drawTypeNameText(char *name, struct TextPosInfo *pos, + boolean active) +{ + char text[MAX_PLAYER_NAME_LEN + 2] = { 0 }; + int sx = mSX + ALIGNED_TEXT_XPOS(pos); + int sy = 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 = mSX + ALIGNED_TEXT_XPOS(pos); + + DrawText(sx, sy, text, font_nr); +} static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos) { @@ -4025,7 +4045,7 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos) *pos = *mci->pos_input; - if (setup.multiple_users) + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { TreeInfo *ti = player_name_current; int first_entry = ti->cl_first; @@ -4036,6 +4056,7 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos) int font_width = getFontWidth(pos->font); type_name_node = getTreeInfoFromPos(node_first, entry_pos); + type_name_nr = entry_pos; strcpy(name, type_name_node->name); @@ -4045,6 +4066,8 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos) } else { + type_name_nr = user.nr; + strcpy(name, setup.player_name); } @@ -4056,54 +4079,60 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos) *xpos = strlen(name); } -static void setTypeNameValues(char *name, int *font, boolean success) +static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos) { - if (!success) - strcpy(name, type_name_last); - - if (strEqual(name, "")) - strcpy(name, EMPTY_PLAYER_NAME); + // change name of edited user in global list of user names + setString(&global.user_names[type_name_nr], name); - if (setup.multiple_users) + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { - if (type_name_node == NULL) // should not happen - return; + TreeInfo *node = type_name_node; - if (success) - { - type_name_node->color = FC_RED; - - if (strEqual(name, EMPTY_PLAYER_NAME)) - type_name_node->color = FC_BLUE; - } + // change name of edited user in local menu tree structure + setString(&node->name, name); + setString(&node->name_sorting, name); - *font = FONT_TEXT_1 + type_name_node->color; + node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED); + pos->font = (node->color == FC_RED ? FONT_INPUT_1 : FONT_VALUE_OLD); } +} - if (!success) - return; +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); - int last_user_nr = user.nr; + if (!changed) + strcpy(name, type_name_last); - if (setup.multiple_users) - { - int edit_user_nr = posTreeInfo(type_name_node); + if (strEqual(name, "")) + strcpy(name, EMPTY_PLAYER_NAME); + + // if player name not changed, no further action required + if (strEqual(name, type_name_last)) + return; - // change name of edited user in global list of user names - setString(&global.user_names[edit_user_nr], name); + setTypeNameValues_Name(name, pos); - // change name of edited user in local menu tree structure - setString(&type_name_node->name, name); - setString(&type_name_node->name_sorting, name); + // 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(); // temporarily change active user to edited user - user.nr = edit_user_nr; + user.nr = type_name_nr; - // load setup of edited user - LoadSetup(); + // 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(); } // change name of edited user in setup structure @@ -4112,8 +4141,40 @@ static void setTypeNameValues(char *name, int *font, boolean success) // save setup of edited user SaveSetup(); - if (setup.multiple_users) + if (game_status == GAME_MODE_PSEUDO_TYPENAMES || reset_setup) { + if (reset_setup) + { + if (Request("Reset setup values for this player?", REQ_ASK)) + { + // remove setup config file + unlink(getSetupFilename()); + + // set player name to default player name + LoadSetup(); + + // 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); + } + } + // restore currently active user user.nr = last_user_nr; @@ -4127,24 +4188,18 @@ 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; - - if (initialize) - getTypeNameValues(name, &pos_name, &xpos); - struct TextPosInfo *pos = &pos_name; - int sx = mSX + ALIGNED_TEXT_XPOS(pos); - int sy = mSY + ALIGNED_TEXT_YPOS(pos); - 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(sx, sy, pos->width, pos->height, font_active_nr); + boolean active = TRUE; if (initialize) { + getTypeNameValues(name, pos, &xpos); + + int sx = mSX + ALIGNED_TEXT_XPOS(pos); + int sy = mSY + ALIGNED_TEXT_YPOS(pos); + StartTextInput(sx, sy, pos->width, pos->height); } else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) @@ -4162,35 +4217,27 @@ static void HandleTypeNameExt(boolean initialize, Key key) } else if (key == KSYM_Return) { - setTypeNameValues(name, &font_nr, TRUE); + setTypeNameValues(name, pos, TRUE); - is_active = FALSE; + active = FALSE; } else if (key == KSYM_Escape) { - setTypeNameValues(name, &font_nr, FALSE); + setTypeNameValues(name, pos, FALSE); - is_active = FALSE; + active = FALSE; } - if (is_active) - { - pos->width = (strlen(name) + 1) * font_width; - sx = mSX + ALIGNED_TEXT_XPOS(pos); + drawTypeNameText(name, pos, active); - DrawText(sx, sy, name, font_active_nr); - DrawText(sx + xpos * font_width, sy, "_", font_active_nr); - } - else + if (!active) { - SetGameStatus(game_status_last_screen); - - pos->width = strlen(name) * font_width; - sx = mSX + ALIGNED_TEXT_XPOS(pos); + StopTextInput(); - DrawText(sx, sy, name, font_nr); + SetGameStatus(game_status_last_screen); - StopTextInput(); + if (game_status == GAME_MODE_MAIN) + InitializeMainControls(); } } @@ -4411,7 +4458,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); @@ -4732,7 +4779,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (mx >= sx1_edit_name && mx <= sx2_edit_name) { - SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + SetGameStatus(GAME_MODE_PSEUDO_TYPENAMES); DrawTypeName();