--- deliantra/server/common/living.C	2007/05/17 00:33:29	1.59
+++ deliantra/server/common/living.C	2007/05/19 00:31:08	1.62
@@ -996,11 +996,12 @@
                 /* skills modifying the character -b.t. */
                 /* for all skills and skill granting objects */
               case SKILL:
-                if (!QUERY_FLAG (tmp, FLAG_APPLIED))
+                if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
                   break;
 
                 if (chosen_skill)
-                  LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
+                  LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
+                       &name, &chosen_skill->name, &tmp->name);
 
                 chosen_skill = tmp;
 
@@ -1367,9 +1368,7 @@
       if (K <= 0.01f)
         K = 0.01f;
 
-      float S = speed / (K * s);
-
-      contr->weapon_sp = S;
+      contr->weapon_sp = K * s * .5f; //TODO: balance the .5
     }
 
   /* I want to limit the power of small monsters with big weapons: */