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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.86 by root, Thu Jan 18 16:19:34 2007 UTC vs.
Revision 1.92 by root, Tue Mar 6 03:06:00 2007 UTC

           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
       /* 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)
 {
   attachable::check_mortals ();
   ++pticks;
 }
+#if 0
+// used fro benchmarking (x86/amd64-specific)
+typedef unsigned long tval;
+typedef unsigned long long stamp64;
+extern inline tval
+stamp (void)
+{
+  tval tsc;
+  asm volatile ("rdtsc":"=a" (tsc)::"edx");
+  return tsc;
+}
+extern inline tval
+measure (tval t)
+{
+  tval tsc;
+  asm volatile ("rdtsc":"=a" (tsc)::"edx");
+  if (tsc > t)
+    return tsc - t;
+  else
+    return t - tsc;
+}
 int
 main (int argc, char **argv)
 {
+  rand_gen rg(0);
+  tval fastest = 0x7fffffff;
+  for (int loop = 10000; loop--; )
+    {
+      tval s = stamp ();
+      volatile int i = rg.get_int(25);
+      fastest = min (fastest, measure (s));
+    }
+  //printf ("fastest %d\n", fastest);
+  for (int i = 0; i < 1024*1024*3; ++i)
+    {
+      char c = rg.get_int (256);
+      write (2, &c, 1);
+    }
+}
+#else
+// normal main
+int
+main (int argc, char **argv)
+{
   settings.argc = argc;
   settings.argv = argv;
   init (argc, argv);
+  init_environ ();
   initPlugins ();
   for (;;)
     cfperl_main ();
 }
+#endif

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.86 by root, Thu Jan 18 16:19:34 2007 UTC vs. Revision 1.92 by root, Tue Mar 6 03:06:00 2007 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.86 by root, Thu Jan 18 16:19:34 2007 UTC vs.
Revision 1.92 by root, Tue Mar 6 03:06:00 2007 UTC