--- deliantra/server/server/c_wiz.C	2006/12/23 13:56:25	1.27
+++ deliantra/server/server/c_wiz.C	2006/12/30 10:16:11	1.28
@@ -246,6 +246,8 @@
   return 1;
 }
 
+//TODO
+#if 0
 int
 command_save_overlay (object *op, char *params)
 {
@@ -266,6 +268,7 @@
 
   return 1;
 }
+#endif
 
 int
 command_shutdown (object *op, char *params)
@@ -276,7 +279,8 @@
       return 1;
     }
 
-  cleanup ();
+  cleanup (0);
+
   /* not reached */
   return 1;
 }
@@ -325,14 +329,17 @@
 
   if (!op)
     return 0;
+
   if (params == NULL)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
       return 1;
     }
+
   pl = get_other_player_from_name (op, params);
   if (!pl)
     return 1;
+
   dummy = get_jail_exit (pl->ob);
   if (!dummy)
     {
@@ -340,7 +347,8 @@
       new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
       return 0;
     }
-  enter_exit (pl->ob, dummy);
+
+  pl->ob->enter_exit (dummy);
   dummy->destroy ();
   new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
   new_draw_info (NDI_UNIQUE, 0, op, "OK.");
@@ -379,7 +387,7 @@
   EXIT_PATH (dummy) = op->map->path;
   EXIT_X (dummy) = op->x + freearr_x[i];
   EXIT_Y (dummy) = op->y + freearr_y[i];
-  enter_exit (pl->ob, dummy);
+  pl->ob->enter_exit (dummy);
   dummy->destroy ();
   new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
   new_draw_info (NDI_UNIQUE, 0, op, "OK.");
@@ -423,7 +431,7 @@
   EXIT_PATH (dummy) = pl->ob->map->path;
   EXIT_X (dummy) = pl->ob->x + freearr_x[i];
   EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
-  enter_exit (op, dummy);
+  op->enter_exit (dummy);
   dummy->destroy ();
   if (!op->contr->hidden)
     new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
@@ -1212,98 +1220,6 @@
 }
 
 int
-command_reset (object *op, char *params)
-{
-  maptile *m;
-  object *dummy = NULL, *tmp = NULL;
-
-  if (params == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
-      return 1;
-    }
-
-  if (strcmp (params, ".") == 0)
-    params = op->map->path;
-  
-  m = has_been_loaded (params);
-  if (m == NULL)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
-      return 1;
-    }
-
-  if (m->in_memory != MAP_SWAPPED)
-    {
-      if (m->in_memory != MAP_IN_MEMORY)
-        {
-          LOG (llevError, "Tried to swap out map which was not in memory.\n");
-          return 0;
-        }
-
-      /*
-       * Only attempt to remove the player that is doing the reset, and not other
-       * players or wiz's.
-       */
-      if (op->map == m)
-        {
-          dummy = object::create ();
-          dummy->map = NULL;
-          EXIT_X (dummy) = op->x;
-          EXIT_Y (dummy) = op->y;
-          EXIT_PATH (dummy) = op->map->path;
-          op->remove ();
-          op->map = NULL;
-          tmp = op;
-        }
-      swap_map (m);
-    }
-
-  if (m->in_memory == MAP_SWAPPED)
-    {
-      LOG (llevDebug, "Resetting map %s.\n", m->path);
-
-      /* setting this effectively causes an immediate reload */
-      m->reset_time = 1;
-      flush_old_maps ();
-      new_draw_info (NDI_UNIQUE, 0, op, "OK.");
-
-      if (tmp)
-        {
-          enter_exit (tmp, dummy);
-          dummy->destroy ();
-        }
-
-      return 1;
-    }
-  else
-    {
-      player *pl;
-      int playercount = 0;
-
-      /* Need to re-insert player if swap failed for some reason */
-      if (tmp)
-        {
-          insert_ob_in_map (op, m, NULL, 0);
-          dummy->destroy ();
-        }
-
-      new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
-
-      for_all_players (pl)
-        if (pl->ob->map == m && pl->ob != op)
-          {
-            new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
-            playercount++;
-          }
-
-      if (!playercount)
-        new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
-      return 1;
-    }
-}
-
-int
 command_nowiz (object *op, char *params)
 {                               /* 'noadm' is alias */
   CLEAR_FLAG (op, FLAG_WIZ);