--- deliantra/server/common/item.C	2006/12/20 14:11:42	1.14
+++ deliantra/server/common/item.C	2007/01/03 02:30:51	1.17
@@ -163,9 +163,7 @@
   {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 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},
@@ -871,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))
         {
@@ -937,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)
               {