[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.117 by root, Wed Sep 12 11:10:11 2007 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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
+ * Crossfire TRT 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 <crossfire@schmorp.de>
  */
 #include <global.h>
 #include <object.h>
 #include <tod.h>
 };
 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 (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>");
   // 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.
       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;
 // 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)
       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);
       _exit (0);
     }
-}
-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)
 {
-  if (!(pticks % TICKS_PER_HOUR))
+  if (expect_false (!(pticks % TICKS_PER_HOUR)))
     adjust_daylight ();
-  if (!(pticks % 7))
+  if (expect_false (!(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 ();
   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.117 by root, Wed Sep 12 11:10:11 2007 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.117 by root, Wed Sep 12 11:10:11 2007 UTC