--- deliantra/server/common/utils.C	2007/01/25 03:54:44	1.44
+++ deliantra/server/common/utils.C	2007/01/27 02:19:36	1.45
@@ -120,7 +120,6 @@
  * This is a 64 bit version of random_roll above.  This is needed
  * for exp loss calculations for players changing religions.
  */
-
 sint64
 random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
 {
@@ -137,18 +136,17 @@
       return (min);             /* avoids a float exception */
     }
 
-  /* Don't know of a portable call to get 64 bit random values.
-   * So make a call to get two 32 bit random numbers, and just to
-   * a little byteshifting.  Do make sure the first one is only
-   * 32 bit, so we don't get skewed results
+  /* 
+   * Make a call to get two 32 bit unsigned random numbers, and just to
+   * a little bitshifting.
    */
-  ran = (RANDOM () & 0xffffffff) | ((sint64) RANDOM () << 32);
+  ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
 
   if (op->type != PLAYER)
     return ((ran % diff) + min);
 
   luck = op->stats.luck;
-  if (RANDOM () % base < MIN (10, abs (luck)))
+  if (rndm (base) < MIN (10, abs (luck)))
     {
       /* we have a winner */
       ((luck > 0) ? (luck = 1) : (luck = -1));
@@ -159,6 +157,7 @@
 
       return (MAX (omin, MIN (max, (ran % diff) + min)));
     }
+
   return ((ran % diff) + min);
 }
 
@@ -173,7 +172,7 @@
 int
 die_roll (int num, int size, const object *op, int goodbad)
 {
-  int min, diff, luck, total, i, gotlucky, base, ran;
+  int min, diff, luck, total, i, gotlucky, base;
 
   diff = size;
   min = 1;
@@ -190,7 +189,7 @@
 
   for (i = 0; i < num; i++)
     {
-      if (RANDOM () % base < MIN (10, abs (luck)) && !gotlucky)
+      if (rndm (base) < MIN (10, abs (luck)) && !gotlucky)
         {
           /* we have a winner */
           gotlucky++;
@@ -199,15 +198,13 @@
           if (diff < 1)
             return (num);       /*check again */
           ((goodbad) ? (min += luck) : (diff));
-          ran = RANDOM ();
-          total += MAX (1, MIN (size, (ran % diff) + min));
+          total += MAX (1, MIN (size, rndm (diff) + min));
         }
       else
-        {
-          total += RANDOM () % size + 1;
-        }
+        total += rndm (size) + 1;
     }
-  return (total);
+
+  return total;
 }
 
 /* decay and destroy perishable items in a map */