--- deliantra/server/include/util.h	2007/01/25 03:54:45	1.36
+++ deliantra/server/include/util.h	2007/04/21 22:57:16	1.41
@@ -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
@@ -47,6 +47,51 @@
 
 template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
 
+// lots of stuff taken from FXT
+
+/* Rotate right. This is used in various places for checksumming */
+//TODO: that sucks, use a better checksum algo
+static inline uint32_t
+rotate_right (uint32_t c, uint32_t count = 1)
+{
+  return (c << (32 - count)) | (c >> count);
+}
+
+static inline uint32_t
+rotate_left (uint32_t c, uint32_t count = 1)
+{
+  return (c >> (32 - count)) | (c << count);
+}
+
+// Return abs(a-b)
+// Both a and b must not have the most significant bit set
+static inline uint32_t
+upos_abs_diff (uint32_t a, uint32_t b)
+{
+  long d1 = b - a;
+  long d2 = (d1 & (d1 >> 31)) << 1;
+
+  return d1 - d2;               // == (b - d) - (a + d);
+}
+
+// Both a and b must not have the most significant bit set
+static inline uint32_t
+upos_min (uint32_t a, uint32_t b)
+{
+  int32_t d = b - a;
+  d &= d >> 31;
+  return a + d;
+}
+
+// Both a and b must not have the most significant bit set
+static inline uint32_t
+upos_max (uint32_t a, uint32_t b)
+{
+  int32_t d = b - a;
+  d &= d >> 31;
+  return b - d;
+}
+
 // this is much faster than crossfires original algorithm
 // on modern cpus
 inline int
@@ -222,7 +267,7 @@
   uint32_t operator ()(uint32_t r_max)
   {
     return is_constant (r_max)
-             ? this->next () % r_max
+             ? (next () * (uint64_t)r_max) >> 32U
              : get_range (r_max);
   }
 
@@ -230,7 +275,7 @@
   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))
+              ? r_min + operator ()(max (r_max - r_min + 1, 1))
               : get_range (r_min, r_max);
   }
 
@@ -356,7 +401,7 @@
   void erase (T *obj)
   {
     assert (obj->*index);
-    int pos = obj->*index;
+    unsigned int pos = obj->*index;
     obj->*index = 0;
 
     if (pos < this->size ())