--- deliantra/server/common/living.C	2012/11/12 03:14:32	1.129
+++ deliantra/server/common/living.C	2012/11/12 10:32:18	1.130
@@ -35,7 +35,7 @@
   22, 25, 30, 40, 50
 };
 
-/* changed the name of this to "sp_bonus" from "int_bonus" 
+/* changed the name of this to "sp_bonus" from "int_bonus"
  * because Pow can now be the stat that controls spellpoint
  * advancement. -b.t.
  */
@@ -732,7 +732,8 @@
 object::update_stats ()
 {
   float max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
-  int weapon_weight = 0, weapon_speed = 0;
+  weight_t weapon_weight = 0;
+  int weapon_speed = 0;
   int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
   int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
   object *grace_obj = NULL, *mana_obj = NULL, *tmp;
@@ -1291,7 +1292,7 @@
        * weight limit, then player suffers a speed reduction based on how
        * much above he is, and what is max carry is
        */
-      double f = weight_to_kg_approx (carrying) - max_carry[stats.Str];
+      float f = (sint32)weight_to_kg_approx (carrying) - max_carry[stats.Str];
       if (f > 0.f)
         speed /= (1.f + f / max_carry[stats.Str]);
     }