--- deliantra/server/common/utils.C	2007/01/18 19:32:37	1.40
+++ deliantra/server/common/utils.C	2007/01/18 22:19:59	1.41
@@ -79,38 +79,27 @@
  * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
  */
 int
-random_roll (int min, int max, const object *op, int goodbad)
+random_roll (int r_min, int r_max, const object *op, int goodbad)
 {
-  int omin, diff, luck, base, ran;
+  int base = r_max - r_min > 1 ? 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 (r_max < 1 || r_max < r_min)
     {
-      LOG (llevError, "Calling random_roll with min=%d max=%d\n", min, max);
-      return (min);             /* avoids a float exception */
+      LOG (llevError, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
+      return r_min;
     }
 
-  ran = RANDOM ();
-
-  if (op->type != PLAYER)
-    return ((ran % diff) + min);
-
-  luck = op->stats.luck;
-  if (RANDOM () % base < MIN (10, abs (luck)))
+  if (op->type == PLAYER)
     {
-      /* we have a winner */
-      ((luck > 0) ? (luck = 1) : (luck = -1));
-      diff -= luck;
-      if (diff < 1)
-        return (omin);          /*check again */
-      ((goodbad) ? (min += luck) : (diff));
+      int luck = op->stats.luck;
 
-      return (MAX (omin, MIN (max, (ran % diff) + min)));
+      if (rndm (base) < min (10, abs (luck)))
+        {
+          //TODO: take luck into account
+        }
     }
-  return ((ran % diff) + min);
+
+  return rndm (r_min, r_max);
 }
 
 /*