X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=3638840e82b711166e725178f9d8be2fa8e02a48;hb=d239aab42a5a0661af0056f7f01e95a7f05bd757;hp=dcbac9163a4c5329b020f8398dda7cff395a65b4;hpb=636b164453fcb8011d360427e0ae486bf692743d;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index dcbac916..3638840e 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,7 @@ 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)
@@ -4055,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);
 
@@ -4064,6 +4066,8 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
   }
   else
   {
+    type_name_nr = user.nr;
+
     strcpy(name, setup.player_name);
   }
 
@@ -4076,11 +4080,11 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
 }
 
 static void setTypeNameValues(char *name, struct TextPosInfo *pos,
-			      boolean success)
+			      boolean changed)
 {
   TreeInfo *node = type_name_node;
 
-  if (!success)
+  if (!changed)
     strcpy(name, type_name_last);
 
   if (strEqual(name, ""))
@@ -4091,27 +4095,23 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
     if (node == NULL)		// should not happen
       return;
 
-    if (success)
+    if (changed)
       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;
-
+  // if player name not changed, no further action required
   if (strEqual(name, type_name_last))
     return;
 
   int last_user_nr = user.nr;
 
+  // change name of edited user in global list of user names
+  setString(&global.user_names[type_name_nr], name);
+
   if (setup.multiple_users)
   {
-    int edit_user_nr = posTreeInfo(node);
-
-    // change name of edited user in global list of user names
-    setString(&global.user_names[edit_user_nr], name);
-
     // change name of edited user in local menu tree structure
     setString(&node->name, name);
     setString(&node->name_sorting, name);
@@ -4120,7 +4120,7 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
     SaveSetup();
 
     // temporarily change active user to edited user
-    user.nr = edit_user_nr;
+    user.nr = type_name_nr;
 
     // load setup of edited user
     LoadSetup();
@@ -4147,19 +4147,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);
   char key_char = getValidConfigValueChar(getCharFromKey(key));
   boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
-  boolean is_active = TRUE;
+  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)
@@ -4179,22 +4178,25 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   {
     setTypeNameValues(name, pos, TRUE);
 
-    is_active = FALSE;
+    active = FALSE;
   }
   else if (key == KSYM_Escape)
   {
     setTypeNameValues(name, pos, FALSE);
 
-    is_active = FALSE;
+    active = FALSE;
   }
 
-  drawTypeNameText(name, pos, is_active);
+  drawTypeNameText(name, pos, active);
 
-  if (!is_active)
+  if (!active)
   {
     StopTextInput();
 
     SetGameStatus(game_status_last_screen);
+
+    if (game_status == GAME_MODE_MAIN)
+      InitializeMainControls();
   }
 }
 
@@ -4415,7 +4417,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);