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

diff --git a/src/screens.c b/src/screens.c
index c62ffec9..dcbac916 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4019,6 +4019,25 @@ 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 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)
 {
   struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
@@ -4056,7 +4075,8 @@ 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 success)
 {
   TreeInfo *node = type_name_node;
 
@@ -4074,7 +4094,7 @@ static void setTypeNameValues(char *name, int *font, boolean success)
     if (success)
       node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
 
-    *font = FONT_TEXT_1 + node->color;
+    pos->font = (node->color == FC_RED ? FONT_INPUT_1 : FONT_VALUE_OLD);
   }
 
   if (!success)
@@ -4134,15 +4154,10 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   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);
-
   if (initialize)
   {
     StartTextInput(sx, sy, pos->width, pos->height);
@@ -4162,35 +4177,24 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   }
   else if (key == KSYM_Return)
   {
-    setTypeNameValues(name, &font_nr, TRUE);
+    setTypeNameValues(name, pos, TRUE);
 
     is_active = FALSE;
   }
   else if (key == KSYM_Escape)
   {
-    setTypeNameValues(name, &font_nr, FALSE);
+    setTypeNameValues(name, pos, FALSE);
 
     is_active = FALSE;
   }
 
-  if (is_active)
-  {
-    pos->width = (strlen(name) + 1) * font_width;
-    sx = mSX + ALIGNED_TEXT_XPOS(pos);
+  drawTypeNameText(name, pos, is_active);
 
-    DrawText(sx, sy, name, font_active_nr);
-    DrawText(sx + xpos * font_width, sy, "_", font_active_nr);
-  }
-  else
+  if (!is_active)
   {
-    SetGameStatus(game_status_last_screen);
-
-    pos->width = strlen(name) * font_width;
-    sx = mSX + ALIGNED_TEXT_XPOS(pos);
-
-    DrawText(sx, sy, name, font_nr);
-
     StopTextInput();
+
+    SetGameStatus(game_status_last_screen);
   }
 }