X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=5bbe467ef211387f4651ea1647b7b05ea69fbd02;hb=46117e2d3c0ed234252e1e39a62617e6e77c09b5;hp=3b9504bc0d23682859a96ededc5c76c6c9205e2a;hpb=2a0aa9698a999f688e326d74810f3a365e64ee8f;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 3b9504bc..5bbe467e 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4056,7 +4056,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;
 
@@ -4072,14 +4073,9 @@ static void setTypeNameValues(char *name, int *font, boolean success)
       return;
 
     if (success)
-    {
-      node->color = FC_RED;
-
-      if (strEqual(name, EMPTY_PLAYER_NAME))
-	node->color = FC_BLUE;
-    }
+      node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
 
-    *font = FONT_TEXT_1 + node->color;
+    pos->font = FONT_TEXT_1 + node->color;
   }
 
   if (!success)
@@ -4167,13 +4163,13 @@ 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;
   }
@@ -4193,7 +4189,7 @@ static void HandleTypeNameExt(boolean initialize, Key key)
     pos->width = strlen(name) * font_width;
     sx = mSX + ALIGNED_TEXT_XPOS(pos);
 
-    DrawText(sx, sy, name, font_nr);
+    DrawText(sx, sy, name, pos->font);
 
     StopTextInput();
   }