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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.76 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.80 by pippijn, Sat Jan 6 14:42:30 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
           new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
           return;
         }
     }
-  if (map && map != newmap)
+  if (contr && map != newmap && 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.
       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 != newmap && contr)
+  if (contr && map != newmap)
     {
       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)))
 {
   LOG (llevDebug, "emergency save begin.\n");
   LOG (llevDebug, "saving players.\n");
   for_all_players (pl)
-    if (pl->enable_save)
+    if (pl->enable_save && pl->ob && pl->ns)
       {
         pl->save (true);
         pl->enable_save = true;
       }
   write_book_archive ();
   LOG (llevDebug, "emergency save done.\n");
 }
+// send all clients some informational text
+static void
+cleanup_inform (const char *cause, bool make_core)
+{
+  new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "The server will now shutdown.\n");
+  new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "Cause for this shtudown: %s\n", cause);
+  if (make_core)
+    new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered a crash.\n");
+  else
+    new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered to be a clean shutdown.\n");
+  new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "%s\n", CLEANUP_MESSAGE);
+  flush_sockets ();
+}
 /* clean up everything before exiting */
 void
-cleanup (bool make_core)
+cleanup (const char *cause, bool make_core)
 {
+  LOG (llevError, "cleanup cause: %s\n", cause);
+  if (!make_core)
+    cleanup_inform (cause, make_core);
   LOG (llevDebug, "cleanup begin.\n");
   if (init_done && !in_cleanup)
     {
       in_cleanup = true;
   INVOKE_GLOBAL (CLEANUP);
   LOG (llevDebug, "cleanup done.\n");
   if (make_core)
+    {
+      cleanup_inform (cause, make_core);
-    abort ();
+      abort ();
+    }
   else
     _exit (0);
 }
 int
   initPlugins ();
   for (;;)
     cfperl_main ();
-  cleanup (true);
 }

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.76 by root, Wed Jan 3 20:08:04 2007 UTC vs. Revision 1.80 by pippijn, Sat Jan 6 14:42:30 2007 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.76 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.80 by pippijn, Sat Jan 6 14:42:30 2007 UTC