--- deliantra/server/common/item.C	2007/11/08 19:43:23	1.41
+++ deliantra/server/common/item.C	2008/04/09 14:36:47	1.42
@@ -26,6 +26,8 @@
 #include <living.h>
 #include <spells.h>
 
+const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
+
 /* the ordering of this is actually doesn't make a difference
  * However, for ease of use, new entries should go at the end
  * so those people that debug the code that get used to something
@@ -538,14 +540,18 @@
 const char *
 query_short_name (const object *op)
 {
-  static dynbuf_text buf; buf.clear ();
-
-  if (op->name == NULL)
+  if (op->name == 0)
     return "(null)";
 
-  if (!op->nrof && !op->weight && !op->title && !is_magical (op))
+  if (!op->nrof
+      && !op->weight
+      && !op->title
+      && !is_magical (op)
+      && op->slaying != shstr_money)
     return op->name;            /* To speed things up (or make things slower?) */
 
+  static dynbuf_text buf; buf.clear ();
+
   buf << (op->nrof <= 1 ? op->name : op->name_pl);
 
   if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
@@ -567,6 +573,30 @@
           }
         break;
 
+        case ALTAR:
+        case TRIGGER_ALTAR:
+        case IDENTIFY_ALTAR:
+          if (op->slaying == shstr_money)
+            {
+              bool wrap = !!buf.size ();
+
+              if (wrap) buf << " [";
+
+              archetype *coin = 0;
+
+              for (char const *const *c = coins; *coins; ++c)
+                if ((coin = archetype::find (*c)))
+                  if (op->stats.food % coin->value == 0)
+                    break;
+
+              sint32 coins = op->stats.food / coin->value;
+
+              buf.printf ("drop %d %s", coins, coins == 1 ? &coin->name : &coin->name_pl);
+
+              if (wrap) buf << ']';
+            }
+          break;
+
       case SKILL:
       case AMULET:
       case RING:
@@ -579,6 +609,7 @@
               buf << " " << s;
           }
         break;
+
       default:
         if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
           buf.printf (" %+d", op->magic);