--- deliantra/server/common/object.C	2006/12/25 17:11:16	1.85
+++ deliantra/server/common/object.C	2006/12/26 08:17:58	1.86
@@ -143,7 +143,7 @@
    */
 
   /* For each field in wants, */
-  for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)
+  for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
     {
       key_value *has_field;
 
@@ -563,15 +563,10 @@
   /* No reason putting the archetypes objects on the speed list,
    * since they never really need to be updated.
    */
-
   if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
     {
       LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
-#ifdef MANY_CORES
-      abort ();
-#else
       op->speed = 0;
-#endif
     }
 
   if (arch_init)