--- deliantra/server/common/item.C	2010/03/24 17:41:47	1.72
+++ deliantra/server/common/item.C	2010/04/03 02:27:24	1.77
@@ -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
@@ -49,6 +49,7 @@
  * Basically, for the use/nonuse, the code does something like:
  * "This item goes %s\n", with the use/nonuse values filling in the %s
  */
+// see include/object.h
 Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
   {KW_body_skill   , "You can use it as your skill"         , "It is used as a skill"},
   {KW_body_combat  , "You can wield it as your weapon"      , "It is used as a combat weapon"},
@@ -627,10 +628,10 @@
           case WAND:
           case ROD:
           case HORN:
-            buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
+            buf << " (applied)";
             break;
           case WEAPON:
-            buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
+            buf << " (applied)";
             break;
           case ARMOUR:
           case HELMET:
@@ -746,7 +747,10 @@
 
       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)");
+        if (EXIT_PATH (op) == shstr_random_map_exit)
+          buf << " (random map)";
+        else if (!EXIT_PATH (op))
+          buf << " (closed)";
         break;
 
       default: