--- deliantra/server/common/item.C	2008/04/13 20:21:50	1.43
+++ deliantra/server/common/item.C	2008/04/22 07:01:46	1.48
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -22,7 +22,6 @@
  */
 
 #include <global.h>
-#include <funcpoint.h>
 #include <living.h>
 #include <spells.h>
 
@@ -421,7 +420,7 @@
 query_weight (const object *op)
 {
   static char buf[10];
-  sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
+  sint32 i = op->total_weight ();
 
   if (op->weight < 0)
     return "      ";
@@ -592,7 +591,7 @@
 
               sint32 coins = op->stats.food / coin->value;
 
-              buf.printf ("drop %d %s", coins, coins == 1 ? &coin->name : &coin->name_pl);
+              buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
 
               if (wrap) buf << ']';
             }
@@ -1196,9 +1195,8 @@
 void
 examine (object *op, object *tmp)
 {
-  std::string s = tmp->describe (op);
-
-  new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
+  std::string info = tmp->describe (op);
+  op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
 }
 
 /*
@@ -1360,8 +1358,6 @@
 void
 identify (object *op)
 {
-  object *pl;
-
   SET_FLAG (op, FLAG_IDENTIFIED);
   CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
   CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
@@ -1378,7 +1374,7 @@
         op->title = op->inv->name;
       else if (op->arch)
         {
-          op->name = op->arch->object::name;
+          op->name    = op->arch->object::name;
           op->name_pl = op->arch->object::name_pl;
         }
     }
@@ -1386,14 +1382,10 @@
   /* If the object is on a map, make sure we update its face */
   if (op->map)
     update_object (op, UP_OBJ_CHANGE);
-  else
-    {
-      pl = op->in_player ();
-      if (pl)
-        /* A lot of the values can change from an update - might as well send
-         * it all.
-         */
-        esrv_send_item (pl, op);
-    }
+  else if (object *pl = op->visible_to ())
+    /* A lot of the values can change from an update - might as well send
+     * it all.
+     */
+    esrv_send_item (pl, op);
 }