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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.157 by root, Fri Apr 23 04:32:47 2010 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC

         return false;
     }
   enemy = 0;
-  newmap->insert (this, x, y);
+  //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)
         {
 /* 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");

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