--- deliantra/server/include/util.h	2007/03/01 12:28:16	1.39
+++ deliantra/server/include/util.h	2007/04/21 23:03:54	1.42
@@ -20,7 +20,7 @@
 #include <traits.h>
 
 // use a gcc extension for auto declarations until ISO C++ sanctifies them
-#define AUTODECL(var,expr) typeof(expr) var = (expr)
+#define auto(var,expr) typeof(expr) var = (expr)
 
 // very ugly macro that basicaly declares and initialises a variable
 // that is in scope for the next statement only
@@ -264,18 +264,18 @@
   uint32_t next ();
 
   // uniform distribution
-  uint32_t operator ()(uint32_t r_max)
+  uint32_t operator ()(uint32_t num)
   {
-    return is_constant (r_max)
-             ? this->next () % r_max
-             : get_range (r_max);
+    return is_constant (num)
+             ? (next () * (uint64_t)num) >> 32U
+             : get_range (num);
   }
 
   // return a number within (min .. max)
   int operator () (int r_min, int r_max)
   {
-    return is_constant (r_min) && is_constant (r_max)
-              ? r_min + (*this) (max (r_max - r_min + 1, 1))
+    return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
+              ? r_min + operator ()(r_max - r_min + 1)
               : get_range (r_min, r_max);
   }