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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.7 by root, Thu Sep 21 00:05:24 2006 UTC vs.
Revision 1.16 by elmex, Sat Dec 30 21:07:46 2006 UTC

   {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);
   /* Note that the resolution this provides for players really isn't
    * very good.  Any player with a speed greater than .67 will
    * fall into the 'lightning fast movement' category.
    */
-  if (FABS (op->speed) > MIN_ACTIVE_SPEED)
+  if (op->has_active_speed ())
     {
       switch ((int) ((FABS (op->speed)) * 15))
         {
             case 0:
               strcat (retbuf, "(very slow movement)");
   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.7 by root, Thu Sep 21 00:05:24 2006 UTC vs. Revision 1.16 by elmex, Sat Dec 30 21:07:46 2006 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.7 by root, Thu Sep 21 00:05:24 2006 UTC vs.
Revision 1.16 by elmex, Sat Dec 30 21:07:46 2006 UTC