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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.87 by root, Thu Jan 18 19:32:37 2007 UTC vs.
Revision 1.98 by root, Sat Apr 21 23:03:54 2007 UTC

  * is needed after the players have been updated.
  */
 static void
 process_players1 ()
 {
-  int flag;
   /* Basically, we keep looping until all the players have done their actions. */
-  for (flag = 1; flag != 0;)
+  for (int flag = 1; flag != 0;)
     {
       flag = 0;
       for_all_players (pl)
         {
           pl->refcnt_chk ();
           if (!pl->ob || !pl->ns || !pl->ob->active)
             continue;
-          if (pl->ob->speed_left > 0)
+          if (pl->ob->speed_left > 0 && pl->ns)
             if (handle_newcs_player (pl->ob))
               flag = 1;
           /* If the player is not actively playing, don't make a
            * backup save - nothing to save anyway.  Plus, the
           LOG (llevError, "BUG: process_events(): Free object on list\n");
           op->set_speed (0);
           continue;
         }
-      /* I've seen occasional crashes due to this - the object is removed,
-       * and thus the map it points to (last map it was on) may be bogus
-       * The real bug is to try to find out the cause of this - someone
-       * is probably calling remove_ob without either an insert_ob or
-       * free_object afterwards, leaving an object dangling.  But I'd
-       * rather log this and continue on instead of crashing.
-       * Don't remove players - when a player quits, the object is in
-       * sort of a limbo, of removed, but something we want to keep
-       * around.
-       */
-      if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
-        {
-          LOG (llevError, "BUG: process_events(): Removed object on list\n");
-          char *dump = dump_object (op);
-          LOG (llevError, dump);
-          free (dump);
-          op->destroy ();
-          continue;
-        }
       if (!op->has_active_speed ())
         {
           LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
                           "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)
+      if (op->flag [FLAG_REMOVED])
         {
-          LOG (llevError, "BUG: process_events(): Object without map or "
+          LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
-                          "inventory is on active list: %s (%d)\n", &op->name, op->count);
+               op->debug_desc ());
           op->set_speed (0);
           continue;
         }
       /* Animate the object. Bug or feature that anim_speed
        * is based on ticks, and not the creatures speed?
        */
       if (op->anim_speed && op->last_anim >= op->anim_speed)
         {
-          if ((op->type == PLAYER))
+          animate_object (op, op->type == PLAYER ? op->facing : op->direction);
-            animate_object (op, op->facing);
-          else
-            animate_object (op, op->direction);
           op->last_anim = 1;
         }
       else
         op->last_anim++;
   new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
   if (make_core)
     new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
   else
-    new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players have been saved.\n");
+    new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.\n");
   new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
   flush_sockets ();
 }
   LOG (llevDebug, "cleanup done.\n");
   if (make_core)
     {
       cleanup_inform (cause, make_core);
+      cfperl_cleanup (make_core);
       _exit (1);
     }
   else
+    {
+      new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
+      new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
+      flush_sockets ();
+      cfperl_cleanup (make_core);
-    _exit (0);
+      _exit (0);
+    }
 }
 int
 forbid_play (void)
 {
  * done on the same tick, but that will happen very infrequently
  *
  * I also think this code makes it easier to see how often we really are
  * doing the various things.
  */
-extern unsigned long todtick;
 void
 do_specials (void)
 {
-  if (!(pticks % PTICKS_PER_CLOCK))
+  if (!(pticks % TICKS_PER_HOUR))
-    tick_the_clock ();
+    adjust_daylight ();
   if (!(pticks % 7))
     shstr::gc ();
   if (!(pticks % 2503))

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.87 by root, Thu Jan 18 19:32:37 2007 UTC vs. Revision 1.98 by root, Sat Apr 21 23:03:54 2007 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.87 by root, Thu Jan 18 19:32:37 2007 UTC vs.
Revision 1.98 by root, Sat Apr 21 23:03:54 2007 UTC