[ViewVC] Diff of: cvs/deliantra/server/server/main.C

Comparing deliantra/server/server/main.C (file contents):
Revision 1.63 by root, Sat Dec 30 16:56:16 2006 UTC vs.
Revision 1.68 by root, Sun Dec 31 10:28:36 2006 UTC

  * the function that calls this should figure them out.
  */
 void
 object::enter_map (maptile *newmap, int x, int y)
 {
-  if (!newmap->load ())
-    return;
   if (out_of_map (newmap, x, y))
     {
       LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
       x = newmap->enter_x;
       y = newmap->enter_y;
                &newmap->path, x, y, newmap->width, newmap->height);
           new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
           return;
         }
     }
+  if (map)
+    if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
+      return;
+  /* If it is a player login, he has yet to be inserted anyplace.
+   * otherwise, we need to deal with removing the player here.
+   */
+  remove ();
   /* try to find a spot for the player */
   if (ob_blocked (this, newmap, x, y))
     {                           /* First choice blocked */
       /* We try to find a spot for the player, starting closest in.
       else
         /* not much we can do in this case. */
         LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y);
     }
-  if (map)
-    if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
-      return;
   if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
     return;
   if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
     return;
-  /* If it is a player login, he has yet to be inserted anyplace.
-   * otherwise, we need to deal with removing the player here.
-   */
-  remove ();
   this->x = x;
   this->y = y;
   map = newmap;
   /* since the players map is already loaded, we don't need to worry
    * about pending objects.
    */
   remove_all_pets (newmap);
-}
-/* clean_path takes a path and replaces all / with _
- * We do a strcpy so that we do not change the original string.
- */
-char *
-clean_path (const char *file)
-{
-  static char newpath[MAX_BUF], *cp;
-  assign (newpath, file);
-  for (cp = newpath; *cp != '\0'; cp++)
-    if (*cp == '/')
-      *cp = '_';
-  return newpath;
-}
-/* unclean_path takes a path and replaces all _ with /
- * This basically undoes clean path.
- * We do a strcpy so that we do not change the original string.
- * We are smart enough to start after the last / in case we
- * are getting passed a string that points to a unique map
- * path.
- */
-char *
-unclean_path (const char *src)
-{
-  static char newpath[MAX_BUF], *cp;
-  cp = strrchr (src, '/');
-  assign (newpath, cp ? cp + 1 : src);
-  for (cp = newpath; *cp != '\0'; cp++)
-    if (*cp == '_')
-      *cp = '/';
-  return newpath;
 }
 /* process_players1 and process_players2 do all the player related stuff.
  * I moved it out of process events and process_map.  This was to some
  * extent for debugging as well as to get a better idea of the time used
           free (dump);
           op->destroy ();
           continue;
         }
-      if (!op->speed)
+      if (!op->has_active_speed ())
         {
-          LOG (llevError, "BUG: process_events(): Object %s has no speed, "
+          LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
-                          "but is on active list\n", &op->arch->name);
+                          "but is on active list\n", op->debug_desc (), op->speed);
           op->set_speed (0);
           continue;
         }
       if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
 void
 cleanup (bool make_core)
 {
   LOG (llevDebug, "cleanup begin.\n");
+  if (init_done && !in_cleanup)
+    {
-  in_cleanup = true;
+      in_cleanup = true;
-  if (init_done)
-    emergency_save ();
+      emergency_save ();
+    }
+  else
+    in_cleanup = true;
   LOG (llevDebug, "running cleanup handlers.\n");
   INVOKE_GLOBAL (CLEANUP);
   LOG (llevDebug, "cleanup done.\n");
   initPlugins ();
   for (;;)
     cfperl_main ();
-  // unreached
-  cleanup ();
+  cleanup (true);
-  return 0;
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/main.C (file contents): Revision 1.63 by root, Sat Dec 30 16:56:16 2006 UTC vs. Revision 1.68 by root, Sun Dec 31 10:28:36 2006 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.63 by root, Sat Dec 30 16:56:16 2006 UTC vs.
Revision 1.68 by root, Sun Dec 31 10:28:36 2006 UTC