From: Holger Schemel <info@artsoft.org>
Date: Wed, 21 Oct 2020 00:36:00 +0000 (+0200)
Subject: moved code to set changed player name to separate function
X-Git-Tag: 4.2.1.0~12
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=1851417bfaf585b068fa47d76e9a70928c2832f1;p=rocksndiamonds.git

moved code to set changed player name to separate function
---

diff --git a/src/screens.c b/src/screens.c
index 1a906f5a..4fd0a412 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4079,43 +4079,43 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
   *xpos = strlen(name);
 }
 
-static void setTypeNameValues(char *name, struct TextPosInfo *pos,
-			      boolean changed)
+static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos)
 {
-  TreeInfo *node = type_name_node;
-
-  if (!changed)
-    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 (game_status == GAME_MODE_PSEUDO_TYPENAMES)
   {
-    if (node == NULL)		// should not happen
-      return;
+    TreeInfo *node = type_name_node;
 
-    if (changed)
-      node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
+    // change name of edited user in local menu tree structure
+    setString(&node->name, name);
+    setString(&node->name_sorting, name);
 
+    node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
     pos->font = (node->color == FC_RED ? FONT_INPUT_1 : FONT_VALUE_OLD);
   }
+}
+
+static void setTypeNameValues(char *name, struct TextPosInfo *pos,
+			      boolean changed)
+{
+  if (!changed)
+    strcpy(name, type_name_last);
+
+  if (strEqual(name, ""))
+    strcpy(name, EMPTY_PLAYER_NAME);
 
   // if player name not changed, no further action required
   if (strEqual(name, type_name_last))
     return;
 
-  int last_user_nr = user.nr;
+  setTypeNameValues_Name(name, pos);
 
-  // change name of edited user in global list of user names
-  setString(&global.user_names[type_name_nr], name);
+  int last_user_nr = user.nr;
 
   if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
   {
-    // change name of edited user in local menu tree structure
-    setString(&node->name, name);
-    setString(&node->name_sorting, name);
-
     // save setup of currently active user (may differ from edited user)
     SaveSetup();