--- deliantra/server/common/living.C	2007/01/15 15:41:09	1.29
+++ deliantra/server/common/living.C	2007/01/27 02:19:36	1.33
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 #include <global.h>
 #include <funcpoint.h>
@@ -679,7 +679,7 @@
 void
 object::drain_stat ()
 {
-  drain_specific_stat (RANDOM () % NUM_STATS);
+  drain_specific_stat (rndm (NUM_STATS));
 }
 
 void
@@ -757,7 +757,7 @@
           /* Randomly change the players luck.  Basically, we move it
            * back neutral (if greater>0, subtract, otherwise add)
            */
-          if (RANDOM () % (FABS (tmp->stats.luck)) >= RANDOM () % 30)
+          if (rndm (abs (tmp->stats.luck)) >= rndm (30))
             {
               int diff = tmp->stats.luck > 0 ? -1 : 1;
 
@@ -2027,8 +2027,7 @@
          * a particular skill, so we don't need to pass that
          * along.
          */
-        subtract_player_exp (op, FABS (exp), skill_name, flag);
-
+        subtract_player_exp (op, abs (exp), skill_name, flag);
     }
 }