--- deliantra/server/common/item.C	2009/10/12 21:27:54	1.59
+++ deliantra/server/common/item.C	2009/11/06 13:31:47	1.64
@@ -67,12 +67,6 @@
 /*{"body_dragon_torso", "your body", "a dragon's body"} */
 };
 
-static char numbers[21][20] = {
-  "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
-  "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
-  "eighteen", "nineteen", "twenty"
-};
-
 static char numbers_10[10][20] = {
   "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
   "eighty", "ninety"
@@ -209,7 +203,7 @@
   {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
 };
 
-const int item_types_size = sizeof (item_types) / sizeof (*item_types);
+static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
 
 materialtype_t *materialt;
 
@@ -383,28 +377,15 @@
 const char *
 describe_resistance (const object *op, int newline)
 {
-  static char buf[VERY_BIG_BUF];
-  char buf1[VERY_BIG_BUF];
-  int tmpvar;
-
-  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]);
+  static dynbuf_text buf; buf.clear ();
 
-          strcat (buf, buf1);
-        }
-    }
+  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]);
 
   return buf;
 }
 
-
 /*
  * query_weight(object) returns a character pointer to a static buffer
  * containing the text-representation of the weight of the given object.
@@ -456,26 +437,6 @@
 }
 
 /*
- * get_number(integer) returns the text-representation of the given number
- * in a static buffer.  The buffer might be overwritten at the next
- * call to get_number().
- * It is currently only used by the query_name() function.
- */
-const char *
-get_number (int i)
-{
-  if (i <= 20)
-    return numbers[i];
-  else
-    {
-      static char buf[MAX_BUF];
-
-      sprintf (buf, "%d", i);
-      return buf;
-    }
-}
-
-/*
  *  Returns pointer to static buffer containing ring's or amulet's
  *  abilities
  *  These are taken from old query_name(), but it would work better
@@ -488,7 +449,7 @@
 /* Aug 95 modified this slightly so that Skill tools don't have magic bonus
  * from stats.sp - b.t.
  */
-const char *
+static const char *
 ring_desc (const object *op)
 {
   static dynbuf_text buf; buf.clear ();
@@ -651,7 +612,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))