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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.155 by root, Wed Apr 21 06:45:57 2010 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC

 {
   new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
 }
 /* This is a basic little function to put the player back to his
- * savebed.  We do some error checking - its possible that the
+ * savebed.
- * savebed map may no longer exist, so we make sure the player
- * goes someplace.
  */
 void
 enter_player_savebed (object *op)
 {
   op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
  * new map.  map, x, y must be set.  map is the map we are moving the
  * player to - it could be the map he just came from if the load failed for
  * whatever reason.  If default map coordinates are to be used, then
  * the function that calls this should figure them out.
  */
-void
+bool
 object::enter_map (maptile *newmap, int x, int y)
 {
   if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
-    return;
+    return false;
   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;
       if (out_of_map (newmap, x, y))
         {
           LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
                &newmap->path, x, y, newmap->width, newmap->height);
           new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
-          return;
+          return false;
         }
     }
   if (contr && map != newmap && map)
     if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
-      return;
+      return false;
   // remove, so stupid blocked does not trigger a failure
   remove ();
   /* try to find a spot for the player */
     }
   if (contr && map != newmap)
     {
       if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
-        return;
+        return false;
       if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
-        return;
+        return false;
     }
-  newmap->insert (this, x, y, 0, INS_NO_WALK_ON);
   enemy = 0;
+  //newmap->insert (this, x, y);
+  newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
+  if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
+    {
-  if (contr)
+      if (contr)
-    {
+        {
-      contr->maplevel = newmap->path;
+          contr->maplevel = newmap->path;
-      contr->count = 0;
+          contr->count = 0;
-    }
-  /* Update any golems */
+          /* Update any golems */
-  if (type == PLAYER)
-    if (object *golem = contr->golem)
+          if (object *golem = contr->golem)
-      {
+            {
-        int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
+              int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
-        if (i < 0)
+              if (i < 0)
-          golem->drop_and_destroy ();
+                golem->drop_and_destroy ();
-        else
+              else
-          {
+                {
-            newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
+                  newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
-            golem->direction = find_dir_2 (golem->x - x, golem->y - y);
+                  golem->direction = find_dir_2 (golem->x - x, golem->y - y);
+                }
-          }
+            }
-      }
+        }
-  /* since the players map is already loaded, we don't need to worry
+      /* since the players map is already loaded, we don't need to worry
-   * about pending objects.
+       * about pending objects.
-   */
+       */
-  remove_all_pets (newmap);
+      move_all_pets ();
+      return true;
+    }
+  return false;
 }
 /* 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
 /* clean up everything before exiting */
 void
 emergency_save ()
 {
-  LOG (llevDebug, "emergency save begin.\n");
+  LOG (llevInfo, "emergency_save: enter\n");
+  LOG (llevInfo, "emergency_save: saving book archive\n");
+  write_book_archive ();
   cfperl_emergency_save ();
-  LOG (llevDebug, "saving book archive.\n");
-  write_book_archive ();
-  LOG (llevDebug, "emergency save done.\n");
+  LOG (llevInfo, "emergency_save: leave\n");
 }
 // send all clients some informational text
 static void
 cleanup_inform (const char *cause, bool make_core)
 cleanup (const char *cause, bool make_core)
 {
   if (make_core)
     fork_abort (cause);
-  LOG (llevError, "cleanup cause: %s\n", cause);
+  LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
   if (!make_core)
     cleanup_inform (cause, make_core);
   LOG (llevDebug, "cleanup begin.\n");

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.155 by root, Wed Apr 21 06:45:57 2010 UTC vs. Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.155 by root, Wed Apr 21 06:45:57 2010 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC