--- deliantra/server/common/item.C	2007/04/23 18:21:54	1.27
+++ deliantra/server/common/item.C	2007/05/07 03:05:57	1.30
@@ -50,6 +50,8 @@
  */
 Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
   {"body_range", "in your range slot", "in a human's range slot"},
+  {"body_shield", "as a shield", "as a protective shield"},
+  {"body_combat", "as a combat weapon", "as a combat weapon"},
   {"body_arm", "on your arm", "on a human's arm"},
   {"body_torso", "on your body", "on a human's torso"},
   {"body_head", "on your head", "on a human's head"},
@@ -714,10 +716,10 @@
           case WAND:
           case ROD:
           case HORN:
-            safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);
+            safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF);
             break;
           case WEAPON:
-            safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);
+            safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF);
             break;
           case ARMOUR:
           case HELMET:
@@ -842,11 +844,10 @@
               }
           }
         break;
+
       default:
         if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
-          {
-            sprintf (buf + strlen (buf), " %+d", op->magic);
-          }
+          sprintf (buf + strlen (buf), " %+d", op->magic);
     }
 
   return buf;