--- deliantra/server/common/living.C	2007/08/07 23:38:12	1.77
+++ deliantra/server/common/living.C	2007/11/08 19:43:23	1.80
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra 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 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #include <global.h>
@@ -1352,20 +1352,19 @@
        * weight limit, then player suffers a speed reduction based on how
        * much above he is, and what is max carry is
        */
-      f = (carrying / 1000) - max_carry[stats.Str];
-      if (f > 0)
+      float f = (carrying / 1000) - max_carry[stats.Str];
+      if (f > 0.f)
         speed = speed / (1.f + f / max_carry[stats.Str]);
     }
 
   speed += bonus_speed / 10.f;      /* Not affected by limits */
-
-  speed = speed * speed_reduce_from_disease;
+  speed *= speed_reduce_from_disease;
 
   /* Put a lower limit on speed.  Note with this speed, you move once every
-   * 100 ticks or so.  This amounts to once every 12 seconds of realtime.
+   * 25 ticks or so. This amounts to once every 3 seconds of realtime.
    */
-  if (speed < 0.01f && type == PLAYER)
-    speed = 0.01f;
+  if (speed < 0.04f && type == PLAYER)
+    speed = 0.04f;
 
   if (speed != old_speed)
     set_speed (speed);
@@ -1482,7 +1481,7 @@
   level = (int) (level / 5.);
 
   /* now set the new title */
-  if (pl->contr != NULL)
+  if (pl->contr)
     {
       if (level == 0)
         sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);