--- deliantra/server/common/item.C	2006/12/20 11:20:50	1.11
+++ deliantra/server/common/item.C	2007/01/15 21:06:18	1.19
@@ -1,25 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    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@schmorp.de>
-*/
+ * 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
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * 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@schmorp.de>
+ */
 
 #include <global.h>
 #include <funcpoint.h>
@@ -159,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},
@@ -186,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},
@@ -877,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))
         {
@@ -943,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)
               {