--- deliantra/server/common/compat.C	2009/11/06 13:03:34	1.2
+++ deliantra/server/common/compat.C	2010/03/26 00:59:20	1.5
@@ -2,8 +2,8 @@
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
  * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -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;
@@ -367,21 +367,6 @@
   *dest = '\0';
 }
 
-const char *
-strrstr (const char *haystack, const char *needle)
-{
-  const char *lastneedle;
-
-  lastneedle = NULL;
-  while ((haystack = strstr (haystack, needle)) != NULL)
-    {
-      lastneedle = haystack;
-      haystack++;
-    }
-  return lastneedle;
-
-}
-
 #define EOL_SIZE (sizeof("\n")-1)
 void
 strip_endline (char *buf)