X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=cd59331de9317a368a28ba3e51d4e91b253195f8;hb=55dd4483014c06b210611c6d00f8fee6db39150b;hp=95b56934b1ba724ec404442afd310387fdf2d829;hpb=55188fc81fac757089356928ae7ec26f90c4a7d0;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 95b56934..cd59331d 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -3978,14 +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 last_player_name[MAX_PLAYER_NAME_LEN + 1];
   struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
-  struct TextPosInfo *pos = mci->pos_input;
-  int startx = mSX + ALIGNED_TEXT_XPOS(pos);
-  int starty = mSY + ALIGNED_TEXT_YPOS(pos);
+
+  *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);
   int font_nr = pos->font;
   int font_active_nr = FONT_ACTIVE(font_nr);
   int font_width = getFontWidth(font_active_nr);
@@ -3993,20 +4032,16 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
   boolean is_active = TRUE;
 
-  DrawBackgroundForFont(startx,starty, pos->width, pos->height, font_active_nr);
+  DrawBackgroundForFont(sx, sy, pos->width, pos->height, font_active_nr);
 
   if (initialize)
   {
-    strcpy(last_player_name, setup.player_name);
-
-    xpos = strlen(setup.player_name);
-
-    StartTextInput(startx, starty, pos->width, pos->height);
+    StartTextInput(sx, sy, pos->width, pos->height);
   }
   else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN)
   {
-    setup.player_name[xpos] = key_char;
-    setup.player_name[xpos + 1] = 0;
+    name[xpos] = key_char;
+    name[xpos + 1] = 0;
 
     xpos++;
   }
@@ -4014,39 +4049,37 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   {
     xpos--;
 
-    setup.player_name[xpos] = 0;
+    name[xpos] = 0;
   }
-  else if (key == KSYM_Return && xpos > 0)
+  else if (key == KSYM_Return)
   {
-    SaveSetup();
+    setTypeNameValues(name, &font_nr, TRUE);
 
     is_active = FALSE;
-
-    SetGameStatus(GAME_MODE_MAIN);
   }
   else if (key == KSYM_Escape)
   {
-    strcpy(setup.player_name, last_player_name);
+    setTypeNameValues(name, &font_nr, FALSE);
 
     is_active = FALSE;
-
-    SetGameStatus(GAME_MODE_MAIN);
   }
 
   if (is_active)
   {
-    pos->width = (strlen(setup.player_name) + 1) * font_width;
-    startx = mSX + ALIGNED_TEXT_XPOS(pos);
+    pos->width = (strlen(name) + 1) * font_width;
+    sx = mSX + ALIGNED_TEXT_XPOS(pos);
 
-    DrawText(startx, starty, setup.player_name, font_active_nr);
-    DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
+    DrawText(sx, sy, name, font_active_nr);
+    DrawText(sx + xpos * font_width, sy, "_", font_active_nr);
   }
   else
   {
-    pos->width = strlen(setup.player_name) * font_width;
-    startx = mSX + ALIGNED_TEXT_XPOS(pos);
+    SetGameStatus(GAME_MODE_MAIN);
+
+    pos->width = strlen(name) * font_width;
+    sx = mSX + ALIGNED_TEXT_XPOS(pos);
 
-    DrawText(startx, starty, setup.player_name, font_nr);
+    DrawText(sx, sy, name, font_nr);
 
     StopTextInput();
   }