--- deliantra/server/common/item.C	2009/01/12 00:17:22	1.54
+++ deliantra/server/common/item.C	2009/11/05 15:43:21	1.62
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -171,7 +172,7 @@
   {SPINNER, "spinner", "spinners", 0, 0},
   {GATE, "gate", "gates", 0, 0},
   {BUTTON, "button", "buttons", 0, 0},
-  {CF_HANDLE, "cf handle", "cf handles", 0, 0},
+  {T_HANDLE, "cf handle", "cf handles", 0, 0},
   {HOLE, "hole", "holes", 0, 0},
   {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
   {SIGN, "sign", "signs", 0, 0},
@@ -329,20 +330,13 @@
         enc--;
     }
 
-  if (QUERY_FLAG (op, FLAG_LIFESAVE))
-    enc += 5;
-  if (QUERY_FLAG (op, FLAG_REFL_SPELL))
-    enc += 3;
-  if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
-    enc += 2;
-  if (QUERY_FLAG (op, FLAG_STEALTH))
-    enc += 1;
-  if (QUERY_FLAG (op, FLAG_XRAYS))
-    enc += 2;
-  if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
-    enc += 1;
-  if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
-    enc += 1;
+  if (op->flag [FLAG_LIFESAVE    ]) enc += 5;
+  if (op->flag [FLAG_REFL_SPELL  ]) enc += 3;
+  if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
+  if (op->flag [FLAG_XRAYS       ]) enc += 2;
+  if (op->flag [FLAG_STEALTH     ]) enc += 1;
+  if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
+  if (op->flag [FLAG_MAKE_INVIS  ]) enc += 1;
 
   return get_power_from_ench (enc);
 }
@@ -352,9 +346,7 @@
 const typedata *
 get_typedata (int itemtype)
 {
-  int i;
-
-  for (i = 0; i < item_types_size; i++)
+  for (int i = 0; i < item_types_size; i++)
     if (item_types[i].number == itemtype)
       return &item_types[i];
 
@@ -367,13 +359,11 @@
 const typedata *
 get_typedata_by_name (const char *name)
 {
-  int i;
-
-  for (i = 0; i < item_types_size; i++)
+  for (int i = 0; i < item_types_size; i++)
     if (!strcmp (item_types[i].name, name))
       return &item_types[i];
 
-  for (i = 0; i < item_types_size; i++)
+  for (int i = 0; i < item_types_size; i++)
     if (!strcmp (item_types[i].name_pl, name))
       {
         LOG (llevInfo,
@@ -381,7 +371,7 @@
         return &item_types[i];
       }
 
-  return NULL;
+  return 0;
 }
 
 /* describe_resistance generates the visible naming for resistances.
@@ -393,31 +383,21 @@
 const char *
 describe_resistance (const object *op, int newline)
 {
-  static char buf[VERY_BIG_BUF];
-  char buf1[VERY_BIG_BUF];
-  int tmpvar;
+  static dynbuf_text buf; buf.clear ();
 
-  buf[0] = 0;
-  for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
-    {
-      if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1))
-        {
-          if (!newline)
-            sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
-          else
-            sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
+  for (int i = 0; i < NROFATTACKS; i++)
+    if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
+      buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
 
-          strcat (buf, buf1);
-        }
-    }
   return buf;
 }
 
-
 /*
  * query_weight(object) returns a character pointer to a static buffer
  * containing the text-representation of the weight of the given object.
  * The buffer will be overwritten by the next call to query_weight().
+ *
+ * Seems to be used only by unimportant stuff. Remove?
  */
 const char *
 query_weight (const object *op)
@@ -453,6 +433,7 @@
 
   if (i < 21)
     return levelnumbers[i];
+
   if (!(i % 10))
     return levelnumbers_10[i / 10];
 
@@ -538,6 +519,8 @@
 /*
  * query_short_name(object) is similar to query_name, but doesn't 
  * contain any information about object status (worn/cursed/etc.)
+ *
+ * It is sometimes used when printing messages, so should fit well into a sentence.
  */
 const char *
 query_short_name (const object *op)
@@ -631,6 +614,8 @@
  * returned is good forever.)  However, it makes printing statements that
  * use several names much easier (don't need to store them to temp variables.)
  *
+ * It is used extensively within messages, so should return only a prose
+ * and short description of the item.
  */
 const char *
 query_name (const object *op)
@@ -653,7 +638,7 @@
 
   if (QUERY_FLAG (op, FLAG_INV_LOCKED))
     buf << " *";
-  if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
+  if (op->is_open_container ())
     buf << " (open)";
 
   if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
@@ -677,7 +662,7 @@
     buf << " (magic)";
 
 #if 0
-  /* item_power will be returned in desribe_item - it shouldn't really
+  /* item_power will be returned in describe_item - it shouldn't really
    * be returned in the name.
    */
   if (op->item_power)
@@ -752,6 +737,9 @@
  * don't include the item count or item status.  Used for inventory sorting
  * and sending to client.
  * If plural is set, we generate the plural name of this.
+ *
+ * It is sometimes used to display messages, and usually only used to match stuff,
+ * so maybe this function should be removed.
  */
 const char *
 query_base_name (const object *op, int plural)
@@ -956,11 +944,6 @@
  * a dwarven axe, in which the full abilities are only known to
  * dwarves, etc.
  *
- * This function is really much more complicated than it should
- * be, because different objects have different meanings
- * for the same field (eg, wands use 'food' for charges).  This
- * means these special cases need to be worked out.
- *
  * Add 'owner' who is the person examining this object.
  * owner can be null if no one is being associated with this
  * item (eg, debug dump or the like)
@@ -1215,6 +1198,9 @@
       if (op->slaying && op->type != FOOD)
         buf.printf ("(slay %s)", &op->slaying);
 
+      if (op->type == SKILL_TOOL && op->skill)
+        buf.printf ("(%s)", &op->skill);
+
       buf.add_abilities ("Attacks", op->attacktype);
       /* resistance on flesh is only visible for quetzals.  If
        * non flesh, everyone can see its resistances
@@ -1240,6 +1226,7 @@
 examine (object *op, object *tmp)
 {
   std::string info = tmp->describe (op);
+
   op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
 }