X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=e7e901d63bc727bb61d6369a72f9b546ab4bb049;hb=dc5bc8be5ed01b91caf1dca3b4977c712c0af673;hp=24d440c7bb71e9c724be6a7282c61d8bb2a9711e;hpb=7883c95567d936c3c43253a8d8ce7acc8f39ae4f;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 24d440c7..e7e901d6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -3978,15 +3978,53 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 // type name functions
 // ============================================================================
 
-static void HandleTypeNameExt(boolean initialize, Key key)
+static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 };
+
+static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
 {
-  static char name[MAX_PLAYER_NAME_LEN + 1];
-  static char last_player_name[MAX_PLAYER_NAME_LEN + 1];
   struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
-  struct TextPosInfo *pos = mci->pos_input;
+
+  *pos = *mci->pos_input;
+
+  strcpy(name, setup.player_name);
+  strcpy(type_name_last, name);
+
+  if (strEqual(name, EMPTY_PLAYER_NAME))
+    strcpy(name, "");
+
+  *xpos = strlen(name);
+}
+
+static void setTypeNameValues(char *name, int *font, boolean success)
+{
+  if (!success)
+    strcpy(name, type_name_last);
+
+  if (strEqual(name, ""))
+    strcpy(name, EMPTY_PLAYER_NAME);
+
+  if (!success)
+    return;
+
+  // change name of edited user in setup structure
+  strcpy(setup.player_name, name);
+
+  // save setup of edited user
+  SaveSetup();
+}
+
+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);
-  static int xpos = 0;
   int font_nr = pos->font;
   int font_active_nr = FONT_ACTIVE(font_nr);
   int font_width = getFontWidth(font_active_nr);
@@ -3998,11 +4036,6 @@ static void HandleTypeNameExt(boolean initialize, Key key)
 
   if (initialize)
   {
-    strcpy(name, setup.player_name);
-    strcpy(last_player_name, name);
-
-    xpos = strlen(name);
-
     StartTextInput(sx, sy, pos->width, pos->height);
   }
   else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN)
@@ -4018,17 +4051,15 @@ static void HandleTypeNameExt(boolean initialize, Key key)
 
     name[xpos] = 0;
   }
-  else if (key == KSYM_Return && xpos > 0)
+  else if (key == KSYM_Return)
   {
-    strcpy(setup.player_name, name);
-
-    SaveSetup();
+    setTypeNameValues(name, &font_nr, TRUE);
 
     is_active = FALSE;
   }
   else if (key == KSYM_Escape)
   {
-    strcpy(name, last_player_name);
+    setTypeNameValues(name, &font_nr, FALSE);
 
     is_active = FALSE;
   }
@@ -4043,7 +4074,7 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   }
   else
   {
-    SetGameStatus(GAME_MODE_MAIN);
+    SetGameStatus(game_status_last_screen);
 
     pos->width = strlen(name) * font_width;
     sx = mSX + ALIGNED_TEXT_XPOS(pos);