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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.49 by root, Fri Apr 25 11:40:34 2008 UTC vs.
Revision 1.56 by sf-marcmagus, Mon Oct 12 03:09:02 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 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
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 };
 int
 get_power_from_ench (int ench)
 {
-  if (ench <  0) ench =  0;
-  if (ench > 20) ench = 20;
-  return enc_to_item_power[ench];
+  return enc_to_item_power [clamp (ench, 0, 20)];
 }
 /* This takes an object 'op' and figures out what its item_power
  * rating should be.  This should only really be used by the treasure
  * generation code, and when loading legacy objects.  It returns
         enc -= 2;
       else if (op->path_repelled & (1 << i))
         enc--;
     }
-  if (QUERY_FLAG (op, FLAG_LIFESAVE))
+  if (op->flag [FLAG_LIFESAVE    ]) enc += 5;
-    enc += 5;
+  if (op->flag [FLAG_REFL_SPELL  ]) enc += 3;
-  if (QUERY_FLAG (op, FLAG_REFL_SPELL))
+  if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
-    enc += 3;
+  if (op->flag [FLAG_XRAYS       ]) enc += 2;
-  if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
+  if (op->flag [FLAG_STEALTH     ]) enc += 1;
-    enc += 2;
+  if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
-  if (QUERY_FLAG (op, FLAG_STEALTH))
+  if (op->flag [FLAG_MAKE_INVIS  ]) enc += 1;
-    enc += 1;
-  if (QUERY_FLAG (op, FLAG_XRAYS))
-    enc += 2;
-  if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
-    enc += 1;
-  if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
-    enc += 1;
   return get_power_from_ench (enc);
 }
 /* returns the typedata that has a number equal to itemtype, if there
  * isn't one, returns NULL */
 const typedata *
 get_typedata (int itemtype)
 {
-  int i;
-  for (i = 0; i < item_types_size; i++)
+  for (int i = 0; i < item_types_size; i++)
     if (item_types[i].number == itemtype)
       return &item_types[i];
   return NULL;
 }
  * isn't one, return the plural name that matches, if there still isn't
  * one return NULL */
 const typedata *
 get_typedata_by_name (const char *name)
 {
-  int i;
-  for (i = 0; i < item_types_size; i++)
+  for (int i = 0; i < item_types_size; i++)
     if (!strcmp (item_types[i].name, name))
       return &item_types[i];
-  for (i = 0; i < item_types_size; i++)
+  for (int i = 0; i < item_types_size; i++)
     if (!strcmp (item_types[i].name_pl, name))
       {
         LOG (llevInfo,
              "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
         return &item_types[i];
       }
-  return NULL;
+  return 0;
 }
 /* describe_resistance generates the visible naming for resistances.
  * returns a static array of the description.  This can return
  * a big buffer.
             sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
           strcat (buf, buf1);
         }
     }
   return buf;
 }
 /*
  * query_weight(object) returns a character pointer to a static buffer
  * containing the text-representation of the weight of the given object.
  * The buffer will be overwritten by the next call to query_weight().
+ *
+ * Seems to be used only by unimportant stuff. Remove?
  */
 const char *
 query_weight (const object *op)
 {
   static char buf[10];
       return buf;
     }
   if (i < 21)
     return levelnumbers[i];
   if (!(i % 10))
     return levelnumbers_10[i / 10];
   strcpy (buf, numbers_10[i / 10]);
   strcat (buf, levelnumbers[i % 10]);
 }
 /*
  * query_short_name(object) is similar to query_name, but doesn't
  * contain any information about object status (worn/cursed/etc.)
+ *
+ * It is sometimes used when printing messages, so should fit well into a sentence.
  */
 const char *
 query_short_name (const object *op)
 {
-  if (op->name == 0)
+  if (!op->name)
     return "(null)";
   if (!op->nrof
       && !op->weight
       && !op->title
             if (op->type != SPELLBOOK)
               buf.printf (" (lvl %d)", op->level);
           }
         break;
-        case ALTAR:
+      case ALTAR:
-        case TRIGGER_ALTAR:
+      case TRIGGER_ALTAR:
-        case IDENTIFY_ALTAR:
+      case IDENTIFY_ALTAR:
-        case CONVERTER:
+      case CONVERTER:
-          if (op->slaying == shstr_money)
+        if (op->slaying == shstr_money)
-            {
+          {
-              bool wrap = !!buf.size ();
+            bool wrap = !!buf.size ();
-              if (wrap) buf << " [";
+            if (wrap) buf << " [";
-              archetype *coin = 0;
+            archetype *coin = 0;
-              for (char const *const *c = coins; *coins; ++c)
+            for (char const *const *c = coins; *coins; ++c)
-                if ((coin = archetype::find (*c)))
+              if ((coin = archetype::find (*c)))
-                  if (op->stats.food % coin->value == 0)
+                if (op->stats.food % coin->value == 0)
-                    break;
+                  break;
-              sint32 coins = op->stats.food / coin->value;
+            sint32 coins = op->stats.food / coin->value;
-              buf.printf ("drop %d %s (or equivalent)", 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 << ']';
+            if (wrap) buf << ']';
-            }
+          }
-          break;
+        break;
       case SKILL:
       case AMULET:
       case RING:
         if (!op->title)
  * you can make several calls to query_name before the bufs start getting
  * overwritten.  This may be a bad thing (it may be easier to assume the value
  * 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.
  */
 const char *
 query_name (const object *op)
 {
   int len = 0;
    */
   if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
     buf << " (magic)";
 #if 0
-  /* item_power will be returned in desribe_item - it shouldn't really
+  /* item_power will be returned in describe_item - it shouldn't really
    * be returned in the name.
    */
   if (op->item_power)
     sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
           default:
             buf << " (applied)";
         }
     }
+  switch (op->type)
+    {
+      case LAMP:
+        if (op->glow_radius)
+          buf << " (on)";
+        else if (op->stats.food <= 0)
+          buf << " (empty)";
+        else
+          buf << " (off)";
+        break;
+      case TORCH:
+        if (op->glow_radius)
+          buf << " (burning)";
+        else if (op->stats.food <= 0)
+          buf << " (burned out)";
+        break;
+    }
   if (QUERY_FLAG (op, FLAG_UNPAID))
     buf << " (unpaid)";
   return buf;
 }
  * of the given object.  The buffer will be overwritten at the next
  * call to query_base_name().   This is a lot like query_name, but we
  * don't include the item count or item status.  Used for inventory sorting
  * 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.
  */
 const char *
 query_base_name (const object *op, int plural)
 {
   if ((!plural && !op->name) || (plural && !op->name_pl))
    */
   if (op->has_active_speed ())
     switch ((int) ((FABS (op->speed)) * 15))
       {
         case 0:
-          buf << "(very slow movement";
+          buf << "(very slow movement)";
           break;
         case 1:
           buf << "(slow movement)";
           break;
         case 2:
  * wouldn't need to use the SEE_INVISIBLE flag to know it is
  * a dragon player examining food.  Could have things like
  * a dwarven axe, in which the full abilities are only known to
  * dwarves, etc.
  *
- * This function is really much more complicated than it should
- * be, because different objects have different meanings
- * for the same field (eg, wands use 'food' for charges).  This
- * means these special cases need to be worked out.
- *
  * Add 'owner' who is the person examining this object.
  * owner can be null if no one is being associated with this
  * item (eg, debug dump or the like)
  */
 const char *
           buf << "well charged.";
         else if (op->stats.sp == op->stats.maxsp)
           buf << "fully charged.";
         else
           buf << "almost full.";
+        break;
+      case LAMP:
+        {
+          int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
+          buf << "(fuel: ";
+          if (percent == 0)
+            buf << "empty";
+          else if (percent < 10)
+            buf << "very low";
+          else if (percent < 25)
+            buf << "low";
+          else if (percent < 50)
+            buf << "half empty";
+          else if (percent < 75)
+            buf << "half full";
+          else if (percent < 95)
+            buf << "well filled";
+          else if (percent <= 100)
+            buf << "full";
+          buf << ")";
+        }
         break;
       case FOOD:
       case FLESH:
       case DRINK:
       if (QUERY_FLAG (op, FLAG_STEALTH))      buf << "(stealth)";
       if (op->slaying && op->type != FOOD)
         buf.printf ("(slay %s)", &op->slaying);
+      if (op->type == SKILL_TOOL && op->skill) buf.printf ("(%s)", &op->skill);
       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)))
 void
 examine (object *op, object *tmp)
 {
   std::string info = tmp->describe (op);
   op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
 }
 /*
  * inventory prints object's inventory. If inv==NULL then print player's
 {
   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, query_name (tmp), tmp->count, query_weight (tmp));
+      buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
     else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
-      buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp));
+      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 (this));
+    buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
   else
     buf.printf ("%s(empty)\n", indent);
   return buf;
 }
     }
   /* If the object is on a map, make sure we update its face */
   if (op->map)
     update_object (op, UP_OBJ_CHANGE);
-  else if (object *pl = op->visible_to ())
+  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);
 }

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.49 by root, Fri Apr 25 11:40:34 2008 UTC vs. Revision 1.56 by sf-marcmagus, Mon Oct 12 03:09:02 2009 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.49 by root, Fri Apr 25 11:40:34 2008 UTC vs.
Revision 1.56 by sf-marcmagus, Mon Oct 12 03:09:02 2009 UTC