--- deliantra/server/common/loader.C	2007/01/08 12:44:34	1.43
+++ deliantra/server/common/loader.C	2007/01/14 23:15:57	1.45
@@ -632,11 +632,8 @@
                   op->animation_id = 0;
                   CLEAR_FLAG (op, FLAG_ANIMATE);
                 }
-              else
-                {
-                  op->animation_id = find_animation (str);
-                  SET_FLAG (op, FLAG_ANIMATE);
-                }
+              else if ((op->animation_id = find_animation (str)))
+                SET_FLAG (op, FLAG_ANIMATE);
             }
 
             break;
@@ -1279,6 +1276,7 @@
     KW_is_buildable,
     /* 110 */
     KW_destroy_on_death,
+    KW_NULL,
   };
 
   int i;
@@ -1286,7 +1284,7 @@
   /* This saves the key/value lists.  We do it first so that any
    * keys that match field names will be overwritten by the loader.
    */
-  for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next)
+  for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
     {
       /* Find the field in the opposing member. */
       key_value *arch_field = get_ob_key_link (tmp, my_field->key);