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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.71 by root, Mon Jan 1 15:32:40 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
  * the function that calls this should figure them out.
  */
 void
 object::enter_map (maptile *newmap, int x, int y)
 {
-  if (destroyed () || !newmap)
+  if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
     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);
           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)))
         }
       else
         {
           for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
             {
-              tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
+              tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x);
-              tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
+              tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y);
               tmp->map = newmap;
             }
           insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
           contr->ranges[range_golem]->direction =
             find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
         }
     }
-  direction = 0;
   /* since the players map is already loaded, we don't need to worry
    * about pending objects.
    */
   remove_all_pets (newmap);
 {
   LOG (llevDebug, "emergency save begin.\n");
   LOG (llevDebug, "saving players.\n");
   for_all_players (pl)
+    if (pl->enable_save && pl->ob && pl->ns)
+      {
-    pl->save (1);
+        pl->save (true);
+        pl->enable_save = true;
+      }
 //  for_all_players (pl)
 //    if (pl->ob)
 //      pl->ob->remove ();
   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);
-}
-void
-leave (player *pl, int draw_exit)
-{
-  if (pl)
-    {
-      if (pl->ob->type != DEAD_OBJECT)
-        {
-          /* If a hidden dm dropped connection do not create
-           * inconsistencies by showing that they have left the game
-           */
-          if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
-              && draw_exit)
-            {
-              if (pl->ob->map)
-                {
-                  INVOKE_PLAYER (LOGOUT, pl);
-                  LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
-                }
-              char buf[MAX_BUF];
-              sprintf (buf, "%s left the game.", &pl->ob->name);
-              new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
-            }
-          pl->ob->remove ();
-          pl->ob->type = DEAD_OBJECT;   /* To avoid problems with inventory window */
-        }
-      /* We do this so that the socket handling routine can do the final
-       * cleanup.  We also leave that loop to actually handle the freeing
-       * of the data.
-       */
-      if (pl->ns)
-        pl->ns->destroy ();
-    }
 }
 int
 forbid_play (void)
 {
   while (fgets (buf, MAX_BUF, fp))
     {
       if (buf[0] == '#')
         continue;
       if (!strncmp (buf, "msg", 3))
         {
           if (forbit)
             while (fgets (buf, MAX_BUF, fp))    /* print message */
               fputs (buf, logfile);
           break;
         }
       else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
         {
           LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
           continue;
   return 0;
 #endif
 }
 /*
- *  do_specials() is a collection of functions to call from time to time.
+ * do_specials() is a collection of functions to call from time to time.
  * Modified 2000-1-14 MSW to use the global pticks count to determine how
  * often to do things.  This will allow us to spred them out more often.
  * I use prime numbers for the factor count - in that way, it is less likely
  * these actions will fall on the same tick (compared to say using 500/2500/15000
  * which would mean on that 15,000 tick count a whole bunch of stuff gets
   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.71 by root, Mon Jan 1 15:32:40 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.71 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.80 by pippijn, Sat Jan 6 14:42:30 2007 UTC