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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.86 by root, Fri Apr 30 20:43:17 2010 UTC vs.
Revision 1.95 by root, Fri Jan 27 22:01:46 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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
  * 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"},
+# define def(name, use, nonuse) { # name, KW_body_ ## name, use, nonuse },
-  {KW_body_combat  , "You can wield it as your weapon"      , "It is used as a combat weapon"},
+#  include "slotinc.h"
-  {KW_body_range   , "You can use it as your range weapon"  , "It is used as a range weapon"},
+# undef def
-  {KW_body_shield  , "You can wield it as a shield"         , "It is used as a shield"},
-  {KW_body_arm     , "You can put it on your arm"           , "It goes on a human's arm"},
-  {KW_body_torso   , "You can wear it on your body"         , "It goes on a human's torso"},
-  {KW_body_head    , "You can wear it on your head"         , "It goes on a human's head"},
-  {KW_body_neck    , "You can wear it around your neck"     , "It goes around a human's neck"},
-  {KW_body_finger  , "You can wear it on your finger"       , "It goes on a human's finger"} ,
-  {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
-  {KW_body_foot    , "You can put it on your foot"          , "It goes on a human's foot"},
-  {KW_body_hand    , "You can put it on your hand"          , "It goes on a human's hand"},
-  {KW_body_wrist   , "You can wear it around your wrist"    , "It goes around a human's wrist"},
-  {KW_body_waist   , "You can wear it around your waist"    , "It goes around a human's waist"},
-/*{"body_dragon_torso", "your body", "a dragon's body"} */
 };
 static char numbers_10[10][20] = {
   "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
   "eighty", "ninety"
   {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
   {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
   {LIGHTER, "lighter", "lighters", 0, 0},
   {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
   {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
+  {TORCH, "torch", "torches", 0, 0},
   {LAMP, "lamp", "lamps", 0, 0},
   {DUPLICATOR, "duplicator", "duplicators", 0, 0},
   {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
   {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
   {SPINNER, "spinner", "spinners", 0, 0},
   if (op->flag [FLAG_MAKE_INVIS  ]) enc += 1;
   return get_power_from_ench (enc);
 }
+static const struct get_typedata
+{
+  const typedata *data [NUM_TYPES];
+  get_typedata ()
+  {
+    for (int i = 0; i < item_types_size; i++)
+      data [item_types[i].number] = &item_types [i];
+  }
+  const typedata *operator ()(int itemtype) const
+  {
+    return data [itemtype];
+  }
+} get_typedata_;
 /* returns the typedata that has a number equal to itemtype, if there
  * isn't one, returns NULL */
 const typedata *
 get_typedata (int itemtype)
 {
-  for (int i = 0; i < item_types_size; i++)
+  return get_typedata_ (itemtype);
-    if (item_types[i].number == itemtype)
-      return &item_types[i];
-  return NULL;
 }
 /* returns the typedata that has a name equal to itemtype, if there
  * isn't one, return the plural name that matches, if there still isn't
  * one return NULL */
  */
 static const char *
 ring_desc (const object *op)
 {
   static dynbuf_text buf; buf.clear ();
-  int attr, val, len;
+  int attr, val;
   if (op->flag [FLAG_IDENTIFIED])
     {
       for (attr = 0; attr < NUM_STATS; attr++)
         if ((val = op->stats.stat (attr)))
           buf.printf ("(%s%+d)", short_stat_name[attr], val);
-      if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
+      if (op->stats.exp) buf.printf ("(speed %+d)", (int)op->stats.exp);
       if (op->stats.wc)  buf.printf ("(wc%+d)", op->stats.wc);
       if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
       if (op->stats.ac)  buf.printf ("(ac%+d)", op->stats.ac);
       buf << describe_resistance (op, 0);
  * It is also used by examine/ex and similar functions.
  */
 const char *
 query_name (const object *op)
 {
-  int len = 0;
   static dynbuf_text bufs[5];
   static int use_buf = 0;
   use_buf++;
   use_buf %= 5;
   if (op->flag [FLAG_APPLIED])
     {
       switch (op->type)
         {
+          case RANGED:
           case BOW:
           case WAND:
           case ROD:
           case HORN:
-            buf << " (applied)";
-            break;
           case WEAPON:
             buf << " (applied)";
             break;
           case ARMOUR:
           case HELMET:
   if (!identified)
     buf << "(unidentified)";
   switch (op->type)
     {
+      case RANGED:
       case BOW:
       case ARROW:
       case WAND:
       case ROD:
       case HORN:
   /* Down here, we more further describe equipment type items.
    * only describe them if they have been identified or the like.
    */
   if (identified || op->flag [FLAG_BEEN_APPLIED])
     {
-      int attr, val;
-      for (attr = 0; attr < NUM_STATS; attr++)
+      for (int attr = 0; attr < NUM_STATS; attr++)
-        if ((val = op->stats.stat (attr)))
+        if (int val = op->stats.stat (attr))
           buf.printf ("(%s%+d)", short_stat_name[attr], val);
       if (op->stats.exp)
         buf.printf ("(speed %+lld)", (long long) op->stats.exp);
       switch (op->type)
         {
+          case RANGED:
           case BOW:
           case ARROW:
           case GIRDLE:
           case HELMET:
           case SHIELD:
     {
       int more_info = 0;
       switch (op->type)
         {
+          case RANGED:
           case ROD:          /* These use stats.sp for spell selection and stats.food */
           case HORN:         /* and stats.hp for spell-point regeneration... */
           case BOW:
           case ARROW:
           case WAND:
   else if (inv
            && inv->msg
            && inv->type == SPELL
            && flag [FLAG_IDENTIFIED]
            && (type == SPELLBOOK || type == ROD || type == WAND
-               || type == ROD || type == POTION || type == SCROLL))
+               || type == POTION || type == SCROLL))
     // for spellbooks and other stuff that contains spells, print the spell message,
     // unless the object has a custom message handled above.
     buf << '\r' << inv->msg << '\n';
   // try to display the duration for some potions and scrolls

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.86 by root, Fri Apr 30 20:43:17 2010 UTC vs. Revision 1.95 by root, Fri Jan 27 22:01:46 2012 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.86 by root, Fri Apr 30 20:43:17 2010 UTC vs.
Revision 1.95 by root, Fri Jan 27 22:01:46 2012 UTC