--- deliantra/server/common/item.C	2009/11/10 04:38:45	1.67
+++ deliantra/server/common/item.C	2010/03/26 01:04:44	1.74
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * 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
@@ -563,6 +563,7 @@
  *
  * It is used extensively within messages, so should return only a prose
  * and short description of the item.
+ * It is also used by examine/ex and similar functions.
  */
 const char *
 query_name (const object *op)
@@ -688,6 +689,7 @@
  *
  * It is sometimes used to display messages, and usually only used to match stuff,
  * so maybe this function should be removed.
+ * It is also used for client-side inventory/item descriptions.
  */
 const char *
 query_base_name (const object *op, int plural)
@@ -695,7 +697,8 @@
   if ((!plural && !op->name) || (plural && !op->name_pl))
     return "(null)";
 
-  if (!op->nrof && !op->weight && !op->title && !is_magical (op))
+  if (!op->nrof && !op->weight && !op->title && !is_magical (op)
+      && op->type != EXIT)
     return op->name;            /* To speed things up (or make things slower?) */
 
   static dynbuf_text buf; buf.clear ();
@@ -741,6 +744,11 @@
           }
         break;
 
+      case EXIT:
+        // random map exits "unfortunately" get patched, so this only works before entering
+        buf << (EXIT_PATH (op) == shstr_random_map_exit ? " (random map)" : " (exit)");
+        break;
+
       default:
         if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
           buf.printf (" %+d", op->magic);
@@ -765,7 +773,7 @@
    * fall into the 'lightning fast movement' category.
    */
   if (op->has_active_speed ())
-    switch ((int)((fabs (op->speed)) * 15.))
+    switch ((int)(op->speed * 15.))
       {
         case 0:
           buf << "(very slow movement)";
@@ -845,7 +853,7 @@
     }
 
   /* describe attacktypes */
-  if (is_dragon_pl (op))
+  if (op->is_dragon ())
     {
       /* for dragon players display the attacktypes from clawing skill
        * Break apart the for loop - move the comparison checking down -
@@ -1154,7 +1162,7 @@
       /* resistance on flesh is only visible for quetzals.  If
        * non flesh, everyone can see its resistances
        */
-      if (op->type != FLESH || (owner && is_dragon_pl (owner)))
+      if (op->type != FLESH || (owner && owner->is_dragon ()))
         buf << describe_resistance (op, 0);
 
       buf.add_paths ("Attuned",  op->path_attuned);
@@ -1191,7 +1199,7 @@
 
   for (object *tmp = inv; tmp; tmp = tmp->below)
     if (who && QUERY_FLAG (who, FLAG_WIZ))
-      buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
+      buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
     else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
       buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());