--- deliantra/server/common/utils.C	2007/01/01 13:31:46	1.35
+++ deliantra/server/common/utils.C	2007/01/18 19:32:37	1.40
@@ -1,38 +1,68 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program 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
-    (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 GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program 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
+ * (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 GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 /*
  * General convenience functions for crossfire.
  */
 
+#include <cstdlib>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <time.h>
+#include <signal.h>
+
 #include <global.h>
 #include <funcpoint.h>
 #include <material.h>
 
-#include <sys/time.h>
-#include <time.h>
 #include <glib.h>
 
+rand_gen rndm (time (0));
+
+tausworthe_random_generator::tausworthe_random_generator (uint32_t seed)
+{
+  state [0] = max (  2, seed      * 69069U);
+  state [1] = max (  8, state [0] * 69069U);
+  state [2] = max ( 16, state [1] * 69069U);
+  state [3] = max (128, state [2] * 69069U);
+
+  for (int i = 11; --i; )
+    operator ()();
+}
+
+uint32_t
+tausworthe_random_generator::next ()
+{
+  state [0] = ((state [0] & 0xFFFFFFFEU) << 18U) ^ (((state [0] <<  6U) ^ state [0]) >> 13U);
+  state [1] = ((state [1] & 0xFFFFFFF8U) <<  2U) ^ (((state [1] <<  2U) ^ state [1]) >> 27U);
+  state [2] = ((state [2] & 0xFFFFFFF0U) <<  7U) ^ (((state [2] << 13U) ^ state [2]) >> 21U);
+  state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] <<  3U) ^ state [3]) >> 12U);
+
+  return state [0] ^ state [1] ^ state [2] ^ state [3];
+}
+
 /*
  * The random functions here take luck into account when rolling random
  * dice or numbers.  This function has less of an impact the larger the
@@ -48,7 +78,6 @@
  * Generally, op should be the player/caster/hitter requesting the roll,
  * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
  */
-
 int
 random_roll (int min, int max, const object *op, int goodbad)
 {
@@ -178,25 +207,6 @@
   return (total);
 }
 
-/*
- * Another convenience function.  Returns a number between min and max.
- * It is suggested one use these functions rather than RANDOM()%, as it
- * would appear that a number of off-by-one-errors exist due to improper
- * use of %.  This should also prevent SIGFPE.
- */
-
-int
-rndm (int min, int max)
-{
-  int diff;
-
-  diff = max - min + 1;
-  if (max < 1 || diff < 1)
-    return (min);
-
-  return (RANDOM () % diff + min);
-}
-
 /* decay and destroy perishable items in a map */
 void
 maptile::decay_objects ()
@@ -545,6 +555,18 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+void
+fork_abort (const char *msg)
+{
+  if (!fork ())
+    {
+      signal (SIGABRT, SIG_DFL);
+      abort ();
+    }
+
+  LOG (llevError, "fork abort: %s\n", msg);
+}
+
 void *salloc_ (int n) throw (std::bad_alloc)
 {
   void *ptr = g_slice_alloc (n);