--- deliantra/server/common/living.C	2007/05/13 15:13:57	1.56
+++ deliantra/server/common/living.C	2007/05/14 21:32:26	1.57
@@ -1030,13 +1030,6 @@
 
                 break;
 
-              case SKILL_TOOL:
-                if (chosen_skill)
-                  LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
-
-                chosen_skill = tmp;
-                break;
-
               case SHIELD:
                 if (settings.spell_encumbrance == TRUE && type == PLAYER)
                   contr->encumbrance += (int) tmp->weight / 2000;
@@ -1580,11 +1573,11 @@
   skill_obj->level = 1;
   insert_ob_in_ob (skill_obj, op);
 
-  if (op->contr)
+  if (player *pl = op->contr)
     {
-      op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;
-      if (op->contr->ns)
-        op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
+      pl->last_skill_ob [skill_obj->subtype] = skill_obj;
+      if (pl->ns)
+        pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
     }
 
   return skill_obj;