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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.5 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.15 by elmex, Wed Dec 20 14:38:50 2006 UTC

-/*
- * static char *rcsid_item_c =
- *   "$Id: item.C,v 1.5 2006/09/12 18:15:34 root Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 #include <global.h>
 #include <funcpoint.h>
 #include <living.h>
  * 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
  */
 Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
-  {"body_range", "in your range slot", "in a human's range slot"}
+  {"body_range", "in your range slot", "in a human's range slot"},
-  ,
-  {"body_arm", "on your arm", "on a human's arm"}
+  {"body_arm", "on your arm", "on a human's arm"},
-  ,
-  {"body_torso", "on your body", "on a human's torso"}
+  {"body_torso", "on your body", "on a human's torso"},
-  ,
-  {"body_head", "on your head", "on a human's head"}
+  {"body_head", "on your head", "on a human's head"},
-  ,
-  {"body_neck", "around your neck", "around a humans neck"}
+  {"body_neck", "around your neck", "around a humans neck"},
-  ,
-  {"body_skill", "in your skill slot", "in a human's skill slot"}
+  {"body_skill", "in your skill slot", "in a human's skill slot"},
-  ,
-  {"body_finger", "on your finger", "on a human's finger"}
+  {"body_finger", "on your finger", "on a human's finger"} ,
-  ,
-  {"body_shoulder", "around your shoulders", "around a human's shoulders"}
+  {"body_shoulder", "around your shoulders", "around a human's shoulders"},
-  ,
-  {"body_foot", "on your feet", "on a human's feet"}
+  {"body_foot", "on your feet", "on a human's feet"},
-  ,
-  {"body_hand", "on your hands", "on a human's hands"}
+  {"body_hand", "on your hands", "on a human's hands"},
-  ,
-  {"body_wrist", "around your wrists", "around a human's wrist"}
+  {"body_wrist", "around your wrists", "around a human's wrist"},
-  ,
-  {"body_waist", "around your waist", "around a human's waist"}
+  {"body_waist", "around your waist", "around a human's waist"},
-  ,
 /*{"body_dragon_torso", "your body", "a dragon's body"} */
 };
 static char numbers[21][20] = {
   "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
   {POTION, "potion", "potions", SK_ALCHEMY, 0},
   {FOOD, "food", "food", SK_WOODSMAN, 0},
   {POISON, "poison", "poisons", SK_ALCHEMY, 0},
   {BOOK, "book", "books", SK_LITERACY, 0},
   {CLOCK, "clock", "clocks", 0, 0},
-  {LIGHTNING, "lightning", "lightning", 0, 0},
   {ARROW, "arrow", "arrows", SK_BOWYER, 0},
   {BOW, "bow", "bows", SK_BOWYER, 0},
   {WEAPON, "weapon", "weapons", SK_SMITHERY, 0},
   {ARMOUR, "armour", "armour", SK_SMITHERY, 0},
   {PEDESTAL, "pedestal", "pedestals", 0, 0},
   {AMULET, "amulet", "amulets", SK_JEWELER, 0},
   {PLAYERMOVER, "player mover", "player movers", 0, 0},
   {TELEPORTER, "teleporter", "teleporters", 0, 0},
   {CREATOR, "creator", "creators", 0, 0},
   {SKILL, "skill", "skills", 0, 0},
-  {EXPERIENCE, "experience", "experience", 0, 0},
   {EARTHWALL, "earthwall", "earthwalls", 0, 0},
   {GOLEM, "golem", "golems", 0, 0},
   {THROWN_OBJ, "projectile", "projectiles", 0, 0},
   {BLINDNESS, "blindness", "blindness", 0, 0},
   {GOD, "god", "gods", 0, 0},
   {FLOOR, "floor", "floors", 0, 0},
   {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
   {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
   {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
   {LIGHTER, "lighter", "lighters", 0, 0},
-  {TRAP_PART, "trap part", "trap parts", 0, 0},
+  {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
-  {WALL, "wall", "walls", 0, 0},
-  {LIGHT_SOURCE, "light source", "light sources", 0, 0},
   {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
-  {MONSTER, "monster", "monsters", 0, 0},
-  {SPAWN_GENERATOR, "monster generator", "monster generators", 0, 0},
   {LAMP, "lamp", "lamps", 0, 0},
   {DUPLICATOR, "duplicator", "duplicators", 0, 0},
-  {TOOL, "tool", "tools", 0, 0},
   {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
-  {BUILDFAC, "building facility", "building facilities", 0, 0},
   {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
   {SPINNER, "spinner", "spinners", 0, 0},
   {GATE, "gate", "gates", 0, 0},
   {BUTTON, "button", "buttons", 0, 0},
   {CF_HANDLE, "cf handle", "cf handles", 0, 0},
   {SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
   {CONVERTER, "converter", "converters", 0, 0},
   {BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
   {POISONING, "poisoning", "poisonings", 0, 0},
   {SAVEBED, "savebed", "savebeds", 0, 0},
-  {POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
-  {FIREHOLES, "fireholes", "fireholes", 0, 0},
   {WAND, "wand", "wands", SK_THAUMATURGY, 0},
   {SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
   {DIRECTOR, "director", "directors", 0, 0},
   {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
   {FORCE, "force", "forces", 0, 0},
   use_buf++;
   use_buf %= 5;
 #ifdef NEW_MATERIAL_CODE
-  if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname)
+  if ((op->is_armor () || op->is_weapon ()) && op->materialname)
     {
       mt = name_to_material (op->materialname);
       if (mt)
         {
           safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
     return "(null)";
   if (!op->nrof && !op->weight && !op->title && !is_magical (op))
     return op->name;            /* To speed things up (or make things slower?) */
-  if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname)
+  if ((op->is_armor () || op->is_weapon ()) && op->materialname)
     mt = name_to_material (op->materialname);
 #ifdef NEW_MATERIAL_CODE
-  if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname && mt &&
+  if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
       op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
     {
       strcpy (buf, mt->description);
       len = strlen (buf);
       safe_strcat (buf, " ", &len, MAX_BUF);
   LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
 #endif
   return 0;
 }
 /*
  * Supposed to fix face-values as well here, but later.
  */
 void
 identify (object *op)
 {
   object *pl;
   /* If the object is on a map, make sure we update its face */
   if (op->map)
     update_object (op, UP_OBJ_FACE);
   else
     {
-      pl = is_player_inv (op->env);
+      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);
     }
 }

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.5 by root, Tue Sep 12 18:15:34 2006 UTC vs. Revision 1.15 by elmex, Wed Dec 20 14:38:50 2006 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.5 by root, Tue Sep 12 18:15:34 2006 UTC vs.
Revision 1.15 by elmex, Wed Dec 20 14:38:50 2006 UTC