--- deliantra/server/common/item.C	2006/12/20 12:13:48	1.12
+++ deliantra/server/common/item.C	2007/01/03 02:30:51	1.17
@@ -160,15 +160,10 @@
   {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
   {LIGHTER, "lighter", "lighters", 0, 0},
   {BUILDABLE_WALL, "buildable wall", "buildable 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},
@@ -185,8 +180,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},
@@ -876,7 +869,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))
         {
@@ -942,7 +935,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)
               {