--- deliantra/server/common/object.C 2007/05/12 16:06:42 1.147 +++ deliantra/server/common/object.C 2007/05/14 19:08:25 1.148 @@ -452,6 +452,23 @@ this->owner = owner; } +int +object::slottype () const +{ + if (type == SKILL) + { + if (IS_COMBAT_SKILL (subtype)) return slot_combat; + if (IS_RANGED_SKILL (subtype)) return slot_ranged; + } + else + { + if (slot [body_combat].info) return slot_combat; + if (slot [body_range ].info) return slot_ranged; + } + + return slot_none; +} + bool object::change_weapon (object *ob) { @@ -485,10 +502,10 @@ return false; } - new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); + //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); } else - new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); + ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); return true; }