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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.106 by root, Fri May 18 19:46:22 2007 UTC vs.
Revision 1.133 by root, Mon Sep 29 10:31:32 2008 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program 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 2 of the License, or
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * 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, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <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)
 {
-  if (op)
-    clear_win_info (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);
   // remove, so stupid ob_locked does not trigger a failure
   remove ();
   /* try to find a spot for the player */
-  if (ob_blocked (this, newmap, x, y))
+  if (blocked (newmap, x, y))
     {                           /* First choice blocked */
       /* We try to find a spot for the player, starting closest in.
        * We could use find_first_free_spot, but that doesn't randomize it at all,
        * So for example, if the north space is free, you would always end up there even
        * if other spaces around are available.
     if (object *golem = contr->golem)
       {
         int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
         if (i < 0)
-          golem->destroy ();
+          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);
           }
       flag = 0;
       for_all_players (pl)
         {
           pl->refcnt_chk ();
-          if (!pl->ob || !pl->ns || !pl->ob->active)
+          if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
             continue;
           if (handle_newcs_player (pl->ob))
             flag = 1;
         }
   for_all_players (pl)
     {
       object *ob = pl->ob;
-      if (!ob || !pl->ns || !ob->active)
+      if (expect_false (!ob || !pl->ns || !ob->active))
         continue;
-      // process_events might steal us one speed slot for the animation, so adjust accordingly
-      if (ob->speed_left > 0.f)
-        ++ob->speed_left;
       do_some_living (ob);
     }
 }
   process_players1 ();
   for_all_actives (op)
     {
       /* Now process op */
-      if (QUERY_FLAG (op, FLAG_FREED))
+      if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
         {
           LOG (llevError, "BUG: process_events(): Free object on list\n");
           op->set_speed (0);
           continue;
         }
-      if (!op->has_active_speed ())
+      if (expect_false (!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->flag [FLAG_REMOVED])
+      if (expect_false (op->flag [FLAG_REMOVED]))
         {
           LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
                op->debug_desc ());
           op->set_speed (0);
           continue;
           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 ();
 }
 // send all clients some informational text
 static void
 cleanup_inform (const char *cause, bool make_core)
 {
-  int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
+  int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
-  new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
+  new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
-  new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
+  new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", 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");
+    new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
   else
-    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, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
-  new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
+  new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
-  flush_sockets ();
+  client::flush_sockets ();
 }
 /* clean up everything before exiting */
 void
 cleanup (const char *cause, bool make_core)
   LOG (llevDebug, "running cleanup handlers.\n");
   INVOKE_GLOBAL (CLEANUP);
   LOG (llevDebug, "cleanup done.\n");
+  log_cleanup ();
   if (make_core)
-    {
-      cleanup_inform (cause, 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_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
-      new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
+      new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
-      flush_sockets ();
+      client::flush_sockets ();
+    }
-      cfperl_cleanup (make_core);
+  cfperl_cleanup (make_core);
-      _exit (0);
+  _exit (make_core);
-    }
-}
-int
-forbid_play (void)
-{
-#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
-  char buf[MAX_BUF], day[MAX_BUF];
-  FILE *fp;
-  time_t clock;
-  struct tm *tm;
-  int i, start, stop, forbit = 0, comp;
-  clock = time (NULL);
-  tm = (struct tm *) localtime (&clock);
-  sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
-  if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
-    return 0;
-  while (fgets (buf, MAX_BUF, fp))
-    {
-      if (buf[0] == '#')
-        continue;
-      if (!strncmp (buf, "msg", 3))
-        {
-          if (forbit)
-            while (fgets (buf, MAX_BUF, fp))    /* print message */
-              fputs (buf, logfile);
-          break;
-        }
-      else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
-        {
-          LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
-          continue;
-        }
-      for (i = 0; i < 7; i++)
-        {
-          if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
-            forbit = 1;
-        }
-    }
-  close_and_delete (fp, comp);
-  return forbit;
-#else
-  return 0;
-#endif
 }
 /*
  * 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
  * doing the various things.
  */
 void
 do_specials (void)
 {
+  shstr::gc ();
+  archetype::gc ();
-  if (!(pticks % TICKS_PER_HOUR))
+  if (expect_false (!(pticks % TICKS_PER_HOUR)))
     adjust_daylight ();
-  if (!(pticks % 7))
-    shstr::gc ();
-  if (!(pticks % 2503))
+  if (expect_false (!(pticks % 2503)))
     fix_weight ();              /* Hack to fix weightproblems caused by bugs */
-  if (!(pticks % 5003))
+  if (expect_false (!(pticks % 5003)))
     write_book_archive ();
-  if (!(pticks % 5009))
+  if (expect_false (!(pticks % 5009)))
     clean_friendly_list ();
-  if (!(pticks % 5011))
+  if (expect_false (!(pticks % 5011)))
     obsolete_parties ();
-  if (!(pticks % 12503))
+  if (expect_false (!(pticks % 12503)))
     fix_luck ();
 }
 void
 server_tick ()
 {
   // first do the user visible stuff
-  doeric_server ();
   INVOKE_GLOBAL (CLOCK);
-  process_events ();           /* "do" something with objects with speed */
+  process_events (); // "do" something with objects with speed
-  flush_sockets ();
+  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 ();
     }
 }
 #else
+#if 0 // just goofing around, look elsewhere
+#include <malloc.h>
+#include <execinfo.h>
+static void tr_on ();
+static void tr_off ();
+static SMUTEX(tr_mutex);
+#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
+#define ltr_on()  tr_on (); SMUTEX_UNLOCK (tr_mutex);
+static void *
+tr_malloc (size_t size, const void *caller)
+{
+  ltr_off ();
+  void *bt [8];
+  backtrace (bt, 8);
+  void *ptr = malloc (size);
+  ltr_on ();
+  return (char *)ptr;
+}
+static void
+tr_free (void *ptr, const void *caller)
+{
+  ltr_off ();
+  free (ptr);
+  ltr_on ();
+}
+void static *
+tr_realloc (void *ptr, size_t size, const void *caller)
+{
+  ltr_off ();
+  void *nptr = realloc (ptr, size);
+  ltr_on ();
+  return nptr;
+}
+static void *
+tr_memalign (size_t size, size_t alignment, const void *caller)
+{
+  ltr_off ();
+  void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
+  ltr_on ();
+  return ptr;
+}
+static void
+tr_on ()
+{
+  __malloc_hook   = tr_malloc;
+  __realloc_hook  = tr_realloc;
+  __free_hook     = tr_free;
+  __memalign_hook = tr_memalign;
+}
+static void
+tr_off ()
+{
+  __malloc_hook   = 0;
+  __realloc_hook  = 0;
+  __free_hook     = 0;
+  __memalign_hook = 0;
+}
+void (*__malloc_initialize_hook)(void) = tr_on;
+#endif
 // normal main
 int
 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
+#if 0
+int xyzzy ()
+{
+  return rndm(8);
+}
+void xyzzy (object_ptr &a, object_ptr &o)
+{
+  asm volatile ("int3");
+  a = o;
+  asm volatile ("int3");
+}
+#endif

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.106 by root, Fri May 18 19:46:22 2007 UTC vs. Revision 1.133 by root, Mon Sep 29 10:31:32 2008 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.106 by root, Fri May 18 19:46:22 2007 UTC vs.
Revision 1.133 by root, Mon Sep 29 10:31:32 2008 UTC