--- deliantra/server/common/living.C 2007/05/12 18:23:51 1.51 +++ deliantra/server/common/living.C 2007/05/12 19:07:21 1.53 @@ -244,44 +244,6 @@ stats->stat (attr) += value; } -sint8 & -living::stat (int index) -{ - switch (index) - { - case STR: return Str; - case DEX: return Dex; - case CON: return Con; - case INT: return Int; - case WIS: return Wis; - case POW: return Pow; - case CHA: return Cha; - } - - LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index"); - static sint8 dummy; - return dummy; -} - -sint8 -living::stat (int index) const -{ - switch (index) - { - case STR: return Str; - case DEX: return Dex; - case CON: return Con; - case INT: return Int; - case WIS: return Wis; - case POW: return Pow; - case CHA: return Cha; - } - - LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index"); - static sint8 dummy; - return dummy; -} - /* * Ensures that all stats (str/dex/con/wis/cha/int) are within the * 1-30 stat limit. @@ -979,8 +941,7 @@ } /* There may be other things that should not adjust the attacktype */ - if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM) - || current_weapon == tmp) + if (tmp->type != SYMPTOM) { attacktype |= tmp->attacktype; path_attuned |= tmp->path_attuned;