--- deliantra/server/common/compat.C	2009/11/06 13:07:28	1.3
+++ deliantra/server/common/compat.C	2009/11/07 18:30:05	1.4
@@ -162,10 +162,10 @@
 int
 die_roll (int num, int size, const object *op, int goodbad)
 {
-  int min, luck, total, i, gotlucky;
+  int min_roll, luck, total, i, gotlucky;
 
   int diff = size;
-  min = 1;
+  min_roll = 1;
   luck = total = gotlucky = 0;
   int base = diff > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
 
@@ -180,7 +180,7 @@
 
   for (i = 0; i < num; i++)
     {
-      if (rndm (base) < MIN (10, abs (luck)) && !gotlucky)
+      if (rndm (base) < min (10, abs (luck)) && !gotlucky)
         {
           /* we have a winner */
           gotlucky++;
@@ -188,8 +188,8 @@
           diff -= luck;
           if (diff < 1)
             return (num);       /*check again */
-          ((goodbad) ? (min += luck) : (diff));
-          total += MAX (1, MIN (size, rndm (diff) + min));
+          ((goodbad) ? (min_roll += luck) : (diff));
+          total += max (1, min (size, rndm (diff) + min_roll));
         }
       else
         total += rndm (size) + 1;