--- deliantra/server/common/utils.C	2007/04/27 20:06:37	1.54
+++ deliantra/server/common/utils.C	2007/04/28 21:34:37	1.55
@@ -97,7 +97,7 @@
 {
   int base = r_max - r_min > 1 ? 20 : 50;     /* d2 and d3 are corner cases */
 
-  if (r_max < 1 || r_max < r_min)
+  if (r_max < r_min)
     {
       LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
       return r_min;
@@ -123,14 +123,11 @@
 sint64
 random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
 {
-  sint64 omin, diff, luck, ran;
-  int base;
+  sint64 omin = min;
+  sint64 diff = max - min + 1;
+  int base = diff > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
 
-  omin = min;
-  diff = max - min + 1;
-  ((diff > 2) ? (base = 20) : (base = 50));     /* d2 and d3 are corner cases */
-
-  if (max < 1 || diff < 1)
+  if (diff < 0)
     {
       LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
       return (min);             /* avoids a float exception */
@@ -140,12 +137,13 @@
    * Make a call to get two 32 bit unsigned random numbers, and just to
    * a little bitshifting.
    */
-  ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
+  sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
 
   if (op->type != PLAYER)
     return ((ran % diff) + min);
 
-  luck = op->stats.luck;
+  int luck = op->stats.luck;
+
   if (rndm (base) < MIN (10, abs (luck)))
     {
       /* we have a winner */
@@ -153,12 +151,13 @@
       diff -= luck;
       if (diff < 1)
         return (omin);          /*check again */
+
       ((goodbad) ? (min += luck) : (diff));
 
       return (MAX (omin, MIN (max, (ran % diff) + min)));
     }
 
-  return ((ran % diff) + min);
+  return ran % diff + min;
 }
 
 /*
@@ -168,20 +167,20 @@
  * not the recipient (ie, the poor slob getting hit).
  * The args are num D size (ie 4d6)  [garbled 20010916]
  */
-
 int
 die_roll (int num, int size, const object *op, int goodbad)
 {
-  int min, diff, luck, total, i, gotlucky, base;
+  int min, luck, total, i, gotlucky;
 
-  diff = size;
+  int diff = size;
   min = 1;
   luck = total = gotlucky = 0;
-  ((diff > 2) ? (base = 20) : (base = 50));     /* d2 and d3 are corner cases */
+  int base = diff > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
+
   if (size < 2 || diff < 1)
     {
       LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size);
-      return (num);             /* avoids a float exception */
+      return num;             /* avoids a float exception */
     }
 
   if (op->type == PLAYER)