--- deliantra/server/common/item.C	2006/12/18 03:00:02	1.8
+++ deliantra/server/common/item.C	2007/01/06 14:42:28	1.18
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -101,7 +102,6 @@
   {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},
@@ -131,7 +131,6 @@
   {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},
@@ -161,17 +160,11 @@
   {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},
-  {WALL, "wall", "walls", 0, 0},
-  {LIGHT_SOURCE, "light source", "light sources", 0, 0},
+  {BUILDABLE_WALL, "buildable wall", "buildable walls", 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},
@@ -188,8 +181,6 @@
   {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},
@@ -879,7 +870,7 @@
    * 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))
         {
@@ -945,7 +936,7 @@
       int first = 1;
 
       for (t = op->randomitems->items; t != NULL; t = t->next)
-        if (t->item && (t->item->clone.type == SPELL))
+        if (t->item && t->item->clone.type == SPELL)
           {
             if (first)
               {
@@ -1504,11 +1495,9 @@
   return 0;
 }
 
-
 /*
  * Supposed to fix face-values as well here, but later.
  */
-
 void
 identify (object *op)
 {
@@ -1540,7 +1529,7 @@
     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.
@@ -1548,3 +1537,4 @@
         esrv_send_item (pl, op);
     }
 }
+