--- deliantra/server/include/util.h	2007/01/18 22:20:00	1.33
+++ deliantra/server/include/util.h	2007/01/19 15:15:50	1.34
@@ -196,26 +196,44 @@
 // http://www.iro.umontreal.ca/~lecuyer/myftp/papers/tausme2.ps
 struct tausworthe_random_generator
 {
+  // generator
   uint32_t state [4];
 
-  tausworthe_random_generator (uint32_t seed);
+  void operator =(const tausworthe_random_generator &src)
+  {
+    state [0] = src.state [0];
+    state [1] = src.state [1];
+    state [2] = src.state [2];
+    state [3] = src.state [3];
+  }
+
+  void seed (uint32_t seed);
   uint32_t next ();
 
+  // uniform distribution
   uint32_t operator ()(uint32_t r_max)
   {
-    return next () % r_max;
+    return is_constant (r_max)
+             ? this->next () % r_max
+             : get_range (r_max);
   }
 
   // return a number within (min .. max)
   int operator () (int r_min, int r_max)
   {
-    return r_min + (*this) (max (r_max - r_min + 1, 1));
+    return is_constant (r_min) && is_constant (r_max)
+              ? r_min + (*this) (max (r_max - r_min + 1, 1))
+              : get_range (r_min, r_max);
   }
 
   double operator ()()
   {
-    return next () / (double)0xFFFFFFFFU;
+    return this->next () / (double)0xFFFFFFFFU;
   }
+
+protected:
+  uint32_t get_range (uint32_t r_max);
+  int get_range (int r_min, int r_max);
 };
 
 typedef tausworthe_random_generator rand_gen;