Fixed a bug with character deletion (see changelog)

changelog

@@ -35,6 +35,8 @@ export (QQ's a zone into a tarball)t
 Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 tbaMUD 3.59
+[Mar 13 2009] - Jamdog
+  Bug-Fix: Character deletion (remove_player, players.c), where the wrong player was potentially being deleted.
 [Mar 08 2009] - Jamdog
   Fixed a possible crash bug in delete_object (genobj.c) (Thanks Slicer)
   CAP function now recognises both preceeding color codes and ANSI codes (Thanks Slicer)

src/interpreter.c

@@ -1252,6 +1252,7 @@ void nanny(struct descriptor_data *d, char *arg)
 
           /* We get a false positive from the original deleted character. */
           free_char(d->character);
+
           /* Check for multiple creations. */
           if (!valid_name(tmp_name)) {
             write_to_output(d, "Invalid name, please try another.\r\nName: ");

src/players.c

@@ -28,6 +28,12 @@
 #define LOAD_MOVE	2
 #define LOAD_STRENGTH	3
 
+#define PT_PNAME(i) (player_table[(i)].name)
+#define PT_IDNUM(i) (player_table[(i)].id)
+#define PT_LEVEL(i) (player_table[(i)].level)
+#define PT_FLAGS(i) (player_table[(i)].flags)
+#define PT_LLAST(i) (player_table[(i)].last)
+
 /* 'global' vars defined here and used externally */
 /** @deprecated Since this file really is basically a functional extension
  * of the database handling in db.c, until the day that the mud is broken
@@ -118,6 +124,41 @@ int create_entry(char *name)
   return (pos);
 }
 
+
+/* Remove an entry from the in-memory player index table.               *
+ * Requires the 'pos' value returned by the get_ptable_by_name function */
+void remove_player_from_index(int pos)
+{
+  int i;
+
+  if (pos < 0 || pos > top_of_p_table)
+    return;
+
+  /* We only need to free the name string */
+  free(PT_PNAME(pos));
+
+  /* Move every other item in the list down the index */
+  for (i = pos+1; i <= top_of_p_table; i++) {
+    PT_PNAME(i-1) = PT_PNAME(i);
+    PT_IDNUM(i-1) = PT_IDNUM(i);
+    PT_LEVEL(i-1) = PT_LEVEL(i);
+    PT_FLAGS(i-1) = PT_FLAGS(i);
+    PT_LLAST(i-1) = PT_LLAST(i);
+  }
+  PT_PNAME(top_of_p_table) = NULL;
+
+  /* Reduce the index table counter */
+  top_of_p_table--;
+
+  /* And reduce the size of the table */
+  if (top_of_p_table >= 0)
+    RECREATE(player_table, struct player_index_element, (top_of_p_table+1));
+  else {
+    free(player_table);
+    player_table = NULL;
+  }
+}
+
 /* This function necessary to save a seperate ASCII player index */
 void save_player_index(void)
 {
@@ -745,8 +786,8 @@ void remove_player(int pfilepos)
   if (!*player_table[pfilepos].name)
     return;
 
-  /* Update top_of_p_table. */
+  /* Update index table. */
-  top_of_p_table -= 1;
+  remove_player_from_index(pfilepos);
 
   /* Unlink all player-owned files */
   for (i = 0; i < MAX_FILES; i++) {