X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=e9be137bb2ccf9a6c4e340ef1a8ffd4406241cc6;hb=23cca722018a5939f8a7e8080618e45ee52f7e90;hp=e2dba46087f486de974661359bdab8560f7feb38;hpb=298d3f89546bb5ac472c501c940603dbb49db2fb;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index e2dba460..e9be137b 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -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)
 {
@@ -4056,9 +4076,12 @@ 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(char *name, struct TextPosInfo *pos,
+			      boolean changed)
 {
-  if (!success)
+  TreeInfo *node = type_name_node;
+
+  if (!changed)
     strcpy(name, type_name_last);
 
   if (strEqual(name, ""))
@@ -4066,23 +4089,16 @@ static void setTypeNameValues(char *name, int *font, boolean success)
 
   if (setup.multiple_users)
   {
-    if (type_name_node == NULL)		// should not happen
+    if (node == NULL)		// should not happen
       return;
 
-    if (success)
-    {
-      type_name_node->color = FC_RED;
-
-      if (strEqual(name, EMPTY_PLAYER_NAME))
-	type_name_node->color = FC_BLUE;
-    }
+    if (changed)
+      node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
 
-    *font = FONT_TEXT_1 + type_name_node->color;
+    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;
 
@@ -4090,20 +4106,20 @@ static void setTypeNameValues(char *name, int *font, boolean success)
 
   if (setup.multiple_users)
   {
-    int edit_user_nr = posTreeInfo(type_name_node);
+    type_name_nr = posTreeInfo(node);
 
     // change name of edited user in global list of user names
-    setString(&global.user_names[edit_user_nr], name);
+    setString(&global.user_names[type_name_nr], name);
 
     // change name of edited user in local menu tree structure
-    setString(&type_name_node->name, name);
-    setString(&type_name_node->name_sorting, name);
+    setString(&node->name, name);
+    setString(&node->name_sorting, name);
 
     // 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();
@@ -4130,24 +4146,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)
@@ -4165,35 +4175,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();
   }
 }
 
@@ -4735,7 +4737,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();