--- deliantra/server/server/apply.C	2007/05/13 19:56:57	1.94
+++ deliantra/server/server/apply.C	2007/05/14 19:08:26	1.95
@@ -3078,26 +3078,10 @@
   // if the item is combat/ranged, wield the relevant slot first
   // to resolve conflicts.
   if (player *pl = who->contr)
-    switch (op->type)
+    switch (op->slottype ())
       {
-        case WEAPON:
-          who->change_weapon (pl->combat_ob);
-          break;
-
-        case BOW:
-        case ROD:
-        case WAND:
-        case HORN:
-        case SKILL_TOOL:
-          who->change_weapon (pl->ranged_ob);
-          break;
-
-        case SKILL:
-          if (IS_COMBAT_SKILL (op->subtype))
-            who->change_weapon (pl->combat_ob);
-          else if (IS_RANGED_SKILL (op->subtype))
-            who->change_weapon (pl->ranged_ob);
-          break;
+        case slot_combat: who->change_weapon (pl->combat_ob); break;
+        case slot_ranged: who->change_weapon (pl->ranged_ob); break;
       }
 
   /* Can't just apply this object.  Lets see what not and what to do */