removed unneeded request confirmations

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 4fd0a412b739d075818aa479029704f098f9d658..95c953709603bee860dcdebb1166aad83af2120f 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -4100,6 +4100,10 @@ static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos)
 static void setTypeNameValues(char *name, struct TextPosInfo *pos,
                              boolean changed)
 {
+  boolean reset_setup = strEqual(name, "");
+  boolean remove_user = strEqual(name, EMPTY_PLAYER_NAME);
+  boolean create_user = strEqual(type_name_last, EMPTY_PLAYER_NAME);
+
   if (!changed)
     strcpy(name, type_name_last);
 
@@ -4112,6 +4116,9 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
 
   setTypeNameValues_Name(name, pos);
 
+  // redraw player name before (possibly) opening request dialogs
+  drawTypeNameText(name, pos, FALSE);
+
   int last_user_nr = user.nr;
 
   if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
@@ -4122,8 +4129,10 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
     // temporarily change active user to edited user
     user.nr = type_name_nr;
 
-    // load setup of edited user
-    LoadSetup();
+    // load setup of edited user (unless creating user with current setup)
+    if (!create_user ||
+       !Request("Use current setup values for the new player?", REQ_ASK))
+      LoadSetup();
   }
 
   // change name of edited user in setup structure
@@ -4132,8 +4141,40 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
   // save setup of edited user
   SaveSetup();
 
-  if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
+  if (game_status == GAME_MODE_PSEUDO_TYPENAMES || reset_setup)
   {
+    if (reset_setup)
+    {
+      if (Request("Reset setup values for this player?", REQ_ASK))
+      {
+       // remove setup config file
+       unlink(getSetupFilename());
+
+       // set player name to default player name
+       LoadSetup();
+
+       // update player name used by name typing functions
+       strcpy(name, setup.player_name);
+
+       setTypeNameValues_Name(name, pos);
+      }
+    }
+    else if (remove_user && type_name_nr != 0)
+    {
+      if (Request("Remove settings and tapes for deleted player?", REQ_ASK))
+      {
+       char *user_dir = getUserGameDataDir();
+       char *user_dir_removed =
+         getStringCat3WithSeparator(user_dir, "REMOVED",
+                                    getCurrentTimestamp(), ".");
+
+       if (rename(user_dir, user_dir_removed) != 0)
+         Request("Removing settings and tapes failed!", REQ_CONFIRM);
+
+       checked_free(user_dir_removed);
+      }
+    }
+
     // restore currently active user
     user.nr = last_user_nr;