--- deliantra/server/common/living.C 2007/04/29 18:11:39 1.41 +++ deliantra/server/common/living.C 2007/04/29 18:34:57 1.43 @@ -1052,7 +1052,7 @@ } /* There may be other things that should not adjust the attacktype */ - if (tmp->type != SYMPTOM) + if (tmp->type != BOW && tmp->type != SYMPTOM) attacktype |= tmp->attacktype; path_attuned |= tmp->path_attuned; @@ -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;