--- deliantra/server/common/item.C	2007/03/14 04:12:27	1.24
+++ deliantra/server/common/item.C	2007/05/07 03:05:57	1.30
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -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"},
@@ -252,10 +254,9 @@
 int
 get_power_from_ench (int ench)
 {
-  if (ench < 0)
-    ench = 0;
-  if (ench > 20)
-    ench = 20;
+  if (ench <  0) ench =  0;
+  if (ench > 20) ench = 20;
+
   return enc_to_item_power[ench];
 }
 
@@ -344,12 +345,10 @@
     enc += 1;
 
   return get_power_from_ench (enc);
-
 }
 
 /* returns the typedata that has a number equal to itemtype, if there 
  * isn't one, returns NULL */
-
 const typedata *
 get_typedata (int itemtype)
 {
@@ -364,7 +363,6 @@
 /* returns the typedata that has a name equal to itemtype, if there 
  * isn't one, return the plural name that matches, if there still isn't
  * one return NULL */
-
 const typedata *
 get_typedata_by_name (const char *name)
 {
@@ -389,7 +387,7 @@
  * if newline is true, we don't put parens around the description
  * but do put a newline at the end.  Useful when dumping to files
  */
-char *
+const char *
 describe_resistance (const object *op, int newline)
 {
   static char buf[VERY_BIG_BUF];
@@ -418,8 +416,7 @@
  * containing the text-representation of the weight of the given object.
  * The buffer will be overwritten by the next call to query_weight().
  */
-
-char *
+const char *
 query_weight (const object *op)
 {
   static char buf[10];
@@ -427,10 +424,12 @@
 
   if (op->weight < 0)
     return "      ";
+
   if (i % 1000)
     sprintf (buf, "%6.1f", i / 1000.0);
   else
     sprintf (buf, "%4d  ", i / 1000);
+
   return buf;
 }
 
@@ -438,8 +437,7 @@
  * Returns the pointer to a static buffer containing
  * the number requested (of the form first, second, third...)
  */
-
-char *
+const char *
 get_levelnumber (int i)
 {
   static char buf[MAX_BUF];
@@ -449,10 +447,12 @@
       sprintf (buf, "%d.", i);
       return buf;
     }
+
   if (i < 21)
     return levelnumbers[i];
   if (!(i % 10))
     return levelnumbers_10[i / 10];
+
   strcpy (buf, numbers_10[i / 10]);
   strcat (buf, levelnumbers[i % 10]);
   return buf;
@@ -464,7 +464,7 @@
  * call to get_number().
  * It is currently only used by the query_name() function.
  */
-char *
+const char *
 get_number (int i)
 {
   if (i <= 20)
@@ -491,7 +491,7 @@
 /* Aug 95 modified this slightly so that Skill tools don't have magic bonus
  * from stats.sp - b.t.
  */
-char *
+const char *
 ring_desc (const object *op)
 {
   static char buf[VERY_BIG_BUF];
@@ -509,6 +509,7 @@
           sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);
         }
     }
+
   if (op->stats.exp)
     sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
   if (op->stats.wc)
@@ -540,6 +541,7 @@
     strcat (buf, "(reflect missiles)");
   if (QUERY_FLAG (op, FLAG_STEALTH))
     strcat (buf, "(stealth)");
+
   /* Shorten some of the names, so they appear better in the windows */
   len = strlen (buf);
   DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
@@ -614,7 +616,7 @@
           if (!op->title)
             {
               /* If ring has a title, full description isn't so useful */
-              char *s = ring_desc (op);
+              const char *s = ring_desc (op);
 
               if (s[0])
                 {
@@ -644,7 +646,7 @@
  * use several names much easier (don't need to store them to temp variables.)
  *
  */
-char *
+const char *
 query_name (const object *op)
 {
   static char buf[5][HUGE_BUF]; // OMFG
@@ -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:
@@ -833,7 +835,7 @@
         if (!op->title)
           {
             /* If ring has a title, full description isn't so useful */
-            char *s = ring_desc (op);
+            const char *s = ring_desc (op);
 
             if (s[0])
               {
@@ -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;
@@ -1041,8 +1042,7 @@
  * owner can be null if no one is being associated with this
  * item (eg, debug dump or the like)
  */
-
-char *
+const char *
 describe_item (const object *op, object *owner)
 {
   char buf[MAX_BUF];
@@ -1362,6 +1362,12 @@
   return retbuf;
 }
 
+std::string
+object::describe_item (object *who)
+{
+  return std::string (::describe_item (this, who));
+}
+
 /* Return true if the item is magical.  A magical item is one that
  * increases/decreases any abilities, provides a resistance,
  * has a generic magical bonus, or is an artifact.