--- deliantra/server/common/living.C	2010/05/15 23:41:05	1.123
+++ deliantra/server/common/living.C	2012/01/27 22:00:39	1.127
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  * 
@@ -731,7 +731,7 @@
 void
 object::update_stats ()
 {
-  float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
+  float max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
   int weapon_weight = 0, weapon_speed = 0;
   int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
   int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
@@ -1088,7 +1088,7 @@
                   ac -= tmp->stats.ac + tmp->magic;
 
                 if (ARMOUR_SPEED (tmp))
-                  max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
+                  min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
 
                 break;
             }                   /* switch tmp->type */
@@ -1651,7 +1651,6 @@
 {
   object *skill_obj;
   sint64 limit, exp_to_add;
-  int i;
 
   /* prevents some forms of abuse. */
   if (op->contr->braced)
@@ -1903,7 +1902,7 @@
       }
 
   percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
-  level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
+  level_loss = op->stats.exp - levels [max (0, op->level - settings.death_penalty_level)];
 
   if (level_loss < 0)
     level_loss = 0;