X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=95c953709603bee860dcdebb1166aad83af2120f;hb=222f9f6633633ad0a39c2014d6914866b77cf391;hp=f9815ee33678683db95065ffcd5aeae30be29df8;hpb=44da8ca05994d2dcbaea2ad2e1d945bfa0005575;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index f9815ee3..95c95370 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1745,7 +1745,7 @@ static void gotoTopLevelDir(void)
     if (leveldir_current->node_parent->node_group->cl_first == -1)
     {
       int num_leveldirs = numTreeInfoInGroup(leveldir_current);
-      int leveldir_pos = posTreeInfo(leveldir_current);
+      int leveldir_pos = getPosFromTreeInfo(leveldir_current);
       int num_page_entries = MIN(num_leveldirs, NUM_MENU_ENTRIES_ON_SCREEN);
       int cl_first, cl_cursor;
 
@@ -4018,6 +4018,7 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 
 static TreeInfo *type_name_node = NULL;
 static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 };
+static int type_name_nr = 0;
 
 static void drawTypeNameText(char *name, struct TextPosInfo *pos,
 			      boolean active)
@@ -4044,7 +4045,7 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
 
   *pos = *mci->pos_input;
 
-  if (setup.multiple_users)
+  if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
   {
     TreeInfo *ti = player_name_current;
     int first_entry = ti->cl_first;
@@ -4055,6 +4056,7 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
     int font_width = getFontWidth(pos->font);
 
     type_name_node = getTreeInfoFromPos(node_first, entry_pos);
+    type_name_nr = entry_pos;
 
     strcpy(name, type_name_node->name);
 
@@ -4064,6 +4066,8 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
   }
   else
   {
+    type_name_nr = user.nr;
+
     strcpy(name, setup.player_name);
   }
 
@@ -4075,10 +4079,30 @@ static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
   *xpos = strlen(name);
 }
 
+static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos)
+{
+  // 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)
+  {
+    TreeInfo *node = type_name_node;
+
+    // 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)
 {
-  TreeInfo *node = type_name_node;
+  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);
@@ -4086,42 +4110,29 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
   if (strEqual(name, ""))
     strcpy(name, EMPTY_PLAYER_NAME);
 
-  if (setup.multiple_users)
-  {
-    if (node == NULL)		// should not happen
-      return;
-
-    if (changed)
-      node->color = (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
-
-    pos->font = (node->color == FC_RED ? FONT_INPUT_1 : FONT_VALUE_OLD);
-  }
-
   // 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);
 
-  if (setup.multiple_users)
-  {
-    int edit_user_nr = posTreeInfo(node);
+  // redraw player name before (possibly) opening request dialogs
+  drawTypeNameText(name, pos, FALSE);
 
-    // change name of edited user in global list of user names
-    setString(&global.user_names[edit_user_nr], name);
-
-    // change name of edited user in local menu tree structure
-    setString(&node->name, name);
-    setString(&node->name_sorting, name);
+  int last_user_nr = user.nr;
 
+  if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
+  {
     // save setup of currently active user (may differ from edited user)
     SaveSetup();
 
     // temporarily change active user to edited user
-    user.nr = edit_user_nr;
+    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
@@ -4130,8 +4141,40 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
   // save setup of edited user
   SaveSetup();
 
-  if (setup.multiple_users)
+  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;
 
@@ -4415,7 +4458,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   if (button == MB_MENU_INITIALIZE)
   {
     int num_entries = numTreeInfoInGroup(ti);
-    int entry_pos = posTreeInfo(ti);
+    int entry_pos = getPosFromTreeInfo(ti);
 
     align_xoffset = getAlignXOffsetFromTreeInfo(ti);
     align_yoffset = getAlignYOffsetFromTreeInfo(ti);