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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.117 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.129 by root, Tue May 6 16:55:26 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the 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,
  * GNU General Public License for more details.
  *
  * You should have received a copy of 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 <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <object.h>
 #include <tod.h>
 #include <sproto.h>
 #include <time.h>
+#include <glib.h>
 #include <../random_maps/random_map.h>
 #include <../random_maps/rproto.h>
 #include "path.h"
 static char days[7][4] = {
 };
 void
 version (object *op)
 {
-  new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
+  new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
+#if 0
   new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
   new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
   new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
   new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
   new_draw_info (NDI_UNIQUE, 0, op, "");
   new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
   new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
   new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
   new_draw_info (NDI_UNIQUE, 0, op, "");
   new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
+#endif
 }
 /* This is a basic little function to put the player back to his
  * savebed.  We do some error checking - its possible that the
  * savebed map may no longer exist, so we make sure the player
  * goes someplace.
  */
 void
 enter_player_savebed (object *op)
 {
-  object *tmp = object::create ();
+  op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
-  EXIT_PATH (tmp) = op->contr->savebed_map;
-  EXIT_X (tmp) = op->contr->bed_x;
-  EXIT_Y (tmp) = op->contr->bed_y;
-  op->enter_exit (tmp);
-  tmp->destroy ();
 }
 /*
  * enter_map():  Moves the player and pets from current map (if any) to
  * new map.  map, x, y must be set.  map is the map we are moving the
  * the function that calls this should figure them out.
  */
 void
 object::enter_map (maptile *newmap, int x, int y)
 {
-  if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
+  if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
     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);
           op->last_anim = 1;
         }
       else
         ++op->last_anim;
-      if (op->speed_left > 0.f)
+      if (expect_false (op->speed_left > 0.f))
         {
           --op->speed_left;
           process_object (op);
-          if (op->destroyed ())
-            continue;
         }
-      if (!op->contr)
+      if (expect_true (!op->contr))
         op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
     }
   process_players2 ();
 }
   LOG (llevDebug, "running cleanup handlers.\n");
   INVOKE_GLOBAL (CLEANUP);
   LOG (llevDebug, "cleanup done.\n");
+  log_cleanup ();
   if (make_core)
     {
       cleanup_inform (cause, make_core);
       cfperl_cleanup (make_core);
  * doing the various things.
  */
 void
 do_specials (void)
 {
+  shstr::gc ();
+  archetype::gc ();
   if (expect_false (!(pticks % TICKS_PER_HOUR)))
     adjust_daylight ();
-  if (expect_false (!(pticks % 7)))
-    shstr::gc ();
   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;
+  g_thread_init (0); // for the slice allocator only
   init (argc, argv);
-  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.117 by root, Wed Sep 12 11:10:11 2007 UTC vs. Revision 1.129 by root, Tue May 6 16:55:26 2008 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.117 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.129 by root, Tue May 6 16:55:26 2008 UTC