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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.155 by root, Wed Apr 21 06:45:57 2010 UTC vs.
Revision 1.180 by root, Sat Nov 17 23:40:04 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <object.h>
 #include <sproto.h>
 #include <time.h>
 #include <glib.h>
-#include <../random_maps/random_map.h>
+#include <rmg.h>
-#include <../random_maps/rproto.h>
+#include <rproto.h>
 #include "path.h"
 void
 version (object *op)
 {
   new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
 }
 /* This is a basic little function to put the player back to his
- * savebed.  We do some error checking - its possible that the
+ * savebed.
- * savebed map may no longer exist, so we make sure the player
- * goes someplace.
  */
 void
 enter_player_savebed (object *op)
 {
   op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
  * new map.  map, x, y must be set.  map is the map we are moving the
  * player to - it could be the map he just came from if the load failed for
  * whatever reason.  If default map coordinates are to be used, then
  * the function that calls this should figure them out.
  */
-void
+bool
 object::enter_map (maptile *newmap, int x, int y)
 {
-  if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
+  if (destroyed () || !newmap || !newmap->linkable ())
-    return;
+    return false;
   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);
       x = newmap->enter_x;
       if (out_of_map (newmap, x, y))
         {
           LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
                &newmap->path, x, y, newmap->width, newmap->height);
           new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
-          return;
+          return false;
         }
     }
   if (contr && map != newmap && map)
     if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
-      return;
+      return false;
   // remove, so stupid blocked does not trigger a failure
   remove ();
   /* try to find a spot for the player */
             i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
         }
       if (i >= 0)
         {
-          x += freearr_x[i];
+          maptile *m = newmap;
-          y += freearr_y[i];
+          sint16 nx  = x + DIRX (i);
+          sint16 ny  = y + DIRY (i);
+          if (xy_normalise (m, nx, ny))
+            {
+              newmap = m;
+              x = nx;
+              y = ny;
+            }
         }
       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 (contr && map != newmap)
     {
       if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
-        return;
+        return false;
       if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
-        return;
+        return false;
     }
-  newmap->insert (this, x, y, 0, INS_NO_WALK_ON);
   enemy = 0;
+  newmap->activate (); // workaround for activate activating everyhing on the map, includign the palyer on the {link} map
+  //newmap->insert (this, x, y);
+  newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
+  prefetch_surrounding_maps ();
+  if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
+    {
-  if (contr)
+      if (contr)
-    {
+        {
-      contr->maplevel = newmap->path;
+          contr->maplevel = newmap->path;
-      contr->count = 0;
+          contr->count = 0;
-    }
-  /* Update any golems */
+          /* Update any golems */
-  if (type == PLAYER)
-    if (object *golem = contr->golem)
+          if (object *golem = contr->golem)
-      {
+            {
-        int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
+              int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
-        if (i < 0)
+              if (i < 0)
-          golem->drop_and_destroy ();
+                golem->drop_and_destroy ();
-        else
+              else
-          {
+                {
-            newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
+                  newmap->insert (golem, x + DIRX (i), y + DIRY (i));
-            golem->direction = find_dir_2 (golem->x - x, golem->y - y);
+                  golem->direction = find_dir_2 (golem->x - x, golem->y - y);
+                }
-          }
+            }
-      }
+        }
-  /* since the players map is already loaded, we don't need to worry
+      /* since the players map is already loaded, we don't need to worry
-   * about pending objects.
+       * about pending objects.
-   */
+       */
-  remove_all_pets (newmap);
+      move_all_pets ();
+      return true;
+    }
+  return false;
 }
 /* process_players1 and process_players2 do all the player related stuff.
  * I moved it out of process events and process_map.  This was to some
  * extent for debugging as well as to get a better idea of the time used
       // used for the inner loop
       if (_i < actives.size ()) // HACK, rely on _i :/
         {
           object *next = actives [_i + 1];
-          prefetch (&next->flag      , 0, 1);
+          ecb_prefetch (&next->flag      , 0, 1);
-          prefetch (&next->speed     , 0, 1);
+          ecb_prefetch (&next->speed     , 0, 1);
-          prefetch (&next->anim_speed, 0, 1);
+          ecb_prefetch (&next->anim_speed, 0, 1);
-          prefetch (&next->contr     , 0, 1);
+          ecb_prefetch (&next->contr     , 0, 1);
         }
       /* Now process op */
       if (expect_false (op->flag [FLAG_FREED]))
         {
-          LOG (llevError, "BUG: process_events(): Free object on list\n");
+          LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ());
           op->set_speed (0);
           continue;
         }
       if (expect_false (!op->has_active_speed ()))
 /* 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");
   _exit (make_core);
 }
 /*
  * 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
+ * Modified 2000-1-14 MSW to use the global server_tick 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
  * done).  Of course, there can still be times where multiple specials are
 do_specials ()
 {
   shstr::gc ();
   archetype::gc ();
-  if (expect_false (!(pticks % TICKS_PER_HOUR)))
+  if (expect_false (!(server_tick % TICKS_PER_HOUR)))
     maptile::adjust_daylight ();
-  if (expect_false (!(pticks % 2503)))
+  if (expect_false (!(server_tick % 2503)))
     fix_weight ();              /* Hack to fix weightproblems caused by bugs */
-  if (expect_false (!(pticks % 5003)))
+  if (expect_false (!(server_tick % 5003)))
     write_book_archive ();
-  if (expect_false (!(pticks % 5009)))
+  if (expect_false (!(server_tick % 5009)))
     clean_friendly_list ();
-  if (expect_false (!(pticks % 5011)))
+  if (expect_false (!(server_tick % 5011)))
     obsolete_parties ();
-  if (expect_false (!(pticks % 12503)))
+  if (expect_false (!(server_tick % 12503)))
     fix_luck ();
 }
 void
-server_tick ()
+one_tick ()
 {
   // first do the user visible stuff
   INVOKE_GLOBAL (CLOCK);
   process_events (); // "do" something with objects with speed
   client::clock ();  // draw client maps etc.
   // then do some bookkeeping, should not really be here
   do_specials ();               /* Routines called from time to time. */
   attachable::check_mortals ();
-  ++pticks;
+  // now that we aggressively reuse id's, this is very unlikely to happen...
   if (object::object_count >= RESTART_COUNT)
     cleanup ("running out of protocol ID values - need full restart");
 }
 // normal main
 int
 main (int argc, char **argv)
 {
   settings.argc = argc;
   settings.argv = argv;
+  rndm.seed (time (0));
+  // temporary(?) testing hack
+  if (argc >= 2 && !strcmp (argv [1], "--noise"))
+    {
+      void noise_test ();
+      noise_test ();
+      exit (0);
+    }
+#if 0
+  // code sometiems used for timing benchmarks
+  random_number_generator<freeciv_random_generator> rng;
+  rng.seed(0);
+  for (int i = 0; i < 10; ++i)
+    printf ("%08x\n", rng.get_u32());
+  for (int i = 0; i < 1000000; ++i)
+    volatile int r = rng.get_u32 ();
+  cstamp s = stamp ();
+  for (int i = 0; i < 1000000; ++i)
+    volatile int r = rng.next ();
+  printf ("c %d\n", (int)measure (s));
+  exit (0);
+#endif
-  rndm.seed (time (0));
-  g_thread_init (0); // for the slice allocator only
   init (argc, argv);
   for (;;)
     cfperl_main ();
 }

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.155 by root, Wed Apr 21 06:45:57 2010 UTC vs. Revision 1.180 by root, Sat Nov 17 23:40:04 2018 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.155 by root, Wed Apr 21 06:45:57 2010 UTC vs.
Revision 1.180 by root, Sat Nov 17 23:40:04 2018 UTC