--- deliantra/server/common/living.C	2007/07/01 05:00:17	1.68
+++ deliantra/server/common/living.C	2007/07/10 05:51:37	1.70
@@ -866,6 +866,8 @@
         {
           if (type == PLAYER)
             {
+              contr->item_power += tmp->item_power;
+
               if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
                 if (tmp != current_weapon
                     && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
@@ -894,7 +896,6 @@
                   contr->gen_sp        += tmp->stats.sp;
                   contr->gen_grace     += tmp->stats.grace;
                   contr->gen_sp_armour += tmp->gen_sp_armour;
-                  contr->item_power    += tmp->item_power;
                 }
             }                   /* if this is a player */
           else
@@ -1510,14 +1511,11 @@
   char buf[MAX_BUF];            /* tmp. string buffer */
 
   /* now grab the 'dragon_ability'-forces from the player's inventory */
-  shstr_cmp dragon_ability_force ("dragon_ability_force");
-  shstr_cmp dragon_skin_force    ("dragon_skin_force");
-
   for (tmp = who->inv; tmp; tmp = tmp->below)
     if (tmp->type == FORCE)
-      if (tmp->arch->archname == dragon_ability_force)
+      if (tmp->arch->archname == shstr_dragon_ability_force)
         abil = tmp;
-      else if (tmp->arch->archname == dragon_skin_force)
+      else if (tmp->arch->archname == shstr_dragon_skin_force)
         skin = tmp;
 
   /* if the force is missing -> bail out */