--- deliantra/server/common/living.C	2007/04/29 18:11:21	1.40
+++ deliantra/server/common/living.C	2007/04/29 21:44:34	1.44
@@ -1083,7 +1083,7 @@
               if (tmp->stats.exp > 0)
                 {
                   added_speed += tmp->stats.exp / 3.f;
-                  bonus_speed += 1.f + tmp->stats.exp / 3.f;
+                  bonus_speed += tmp->stats.exp / 3.f + 1.f;
                 }
               else
                 added_speed += tmp->stats.exp;
@@ -1123,7 +1123,7 @@
                 if (tmp->stats.wc)
                   wc -= (tmp->stats.wc + tmp->magic);
 
-                if (tmp->slaying != NULL)
+                if (tmp->slaying)
                   slaying = tmp->slaying;
 
                 if (tmp->stats.ac)
@@ -1168,7 +1168,6 @@
 
                 break;
 
-              case BOW:
               case WEAPON:
                 wc -= tmp->stats.wc + tmp->magic;
 
@@ -1177,7 +1176,7 @@
 
                 stats.dam += tmp->stats.dam + tmp->magic;
                 weapon_weight = tmp->weight;
-                weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
+                weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
 
                 if (weapon_speed < 0)
                   weapon_speed = 0;