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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.132 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.136 by root, Tue Dec 30 07:29:08 2008 UTC

     if (object *golem = contr->golem)
       {
         int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
         if (i < 0)
-          {
-            golem->destroy_inv (true); // be explicit about dropping
-            golem->destroy (true);
+          golem->drop_and_destroy ();
-          }
         else
           {
             newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
             golem->direction = find_dir_2 (x - golem->x, y - golem->y);
           }
 {
   shstr::gc ();
   archetype::gc ();
   if (expect_false (!(pticks % TICKS_PER_HOUR)))
-    adjust_daylight ();
+    maptile::adjust_daylight ();
   if (expect_false (!(pticks % 2503)))
     fix_weight ();              /* Hack to fix weightproblems caused by bugs */
   if (expect_false (!(pticks % 5003)))
 main (int argc, char **argv)
 {
   settings.argc = argc;
   settings.argv = argv;
+  rndm.seed (time (0));
   g_thread_init (0); // for the slice allocator only
   init (argc, argv);
   for (;;)

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