[ViewVC] Diff of: cvs/deliantra/server/common/item.C

Comparing deliantra/server/common/item.C (file contents):
Revision 1.68 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.77 by root, Sat Apr 3 02:27:24 2010 UTC

 /*
  * 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 (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 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
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  * Note that using the term 'human' may not be very accurate, humanoid
  * may be better.
  * 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"},
   {KW_body_range   , "You can use it as your range weapon"  , "It is used as a range weapon"},
   {KW_body_shield  , "You can wield it as a shield"         , "It is used as a shield"},
  * returned is good forever.)  However, it makes printing statements that
  * use several names much easier (don't need to store them to temp variables.)
  *
  * 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)
 {
   int len = 0;
         {
           case BOW:
           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:
           case SHIELD:
           case RING:
  * and sending to client.
  * If plural is set, we generate the plural name of this.
  *
  * 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)
 {
   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 ();
 #if 0
             const char *s = ring_desc (op);
             if (s && *s)
               buf << ' ' << s;
           }
+        break;
+      case EXIT:
+        // random map exits "unfortunately" get patched, so this only works before entering
+        if (EXIT_PATH (op) == shstr_random_map_exit)
+          buf << " (random map)";
+        else if (!EXIT_PATH (op))
+          buf << " (closed)";
         break;
       default:
         if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
           buf.printf (" %+d", op->magic);
       if (op->stats.luck)
         buf.printf ("(luck%+d)", op->stats.luck);
     }
   /* 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 -
        * this makes it more readable.
        */
       buf.add_abilities ("Attacks", op->attacktype);
       /* 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);
       buf.add_paths ("Repelled", op->path_repelled);
       buf.add_paths ("Denied",   op->path_denied);
 {
   static dynbuf_text buf; buf.clear ();
   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 ());
   if (buf.size ())
     buf.printf ("%s(total weight: %s)\n", indent, query_weight ());

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/item.C (file contents): Revision 1.68 by root, Sun Nov 29 09:41:27 2009 UTC vs. Revision 1.77 by root, Sat Apr 3 02:27:24 2010 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.68 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.77 by root, Sat Apr 3 02:27:24 2010 UTC