--- deliantra/server/common/loader.C	2007/02/01 19:15:38	1.52
+++ deliantra/server/common/loader.C	2007/02/09 01:52:10	1.56
@@ -32,6 +32,10 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+loader_base::~loader_base ()
+{
+}
+
 // the base class warns about and skips everything
 archetype *
 loader_base::get_arch (const char *name)
@@ -716,6 +720,7 @@
                     {
                       tmp = object::create ();
                       /* record the name of the broken object */
+                      //TODO: but do not log???
                       tmp->name = str;
                     }
 
@@ -783,17 +788,13 @@
 
           case KW_animation:
             {
-              const char *str = thawer.get_str ();
+              CLEAR_FLAG (op, FLAG_ANIMATE);
+              op->animation_id = 0;
 
-              if (!str)
-                {
-                  op->animation_id = 0;
-                  CLEAR_FLAG (op, FLAG_ANIMATE);
-                }
-              else if ((op->animation_id = find_animation (str)))
+              const char *str = thawer.get_str ();
+              if (str && (op->animation_id = find_animation (str)))
                 SET_FLAG (op, FLAG_ANIMATE);
             }
-
             break;
 
           case KW_last_heal:  thawer.get (op->last_heal);  break;
@@ -868,7 +869,7 @@
           case KW_magic:                thawer.get (op->magic); break;
           case KW_state:                thawer.get (op->state); break;
           case KW_move_slow_penalty:    thawer.get (op->move_slow_penalty); break;
-          case KW_material:             thawer.get (op->material); break;
+          case KW_material:             thawer.get (op->materials); break; //TODO: nuke
           case KW_materialname:         thawer.get (op->materialname); break;
 
             /* These are the new values */
@@ -1140,6 +1141,8 @@
 
           case KW_randomitems:
             op->randomitems = find_treasurelist (thawer.get_str ());
+            //if (!op->randomitems)
+            //  LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ());
             break;
 
           case KW_msg:
@@ -1537,7 +1540,7 @@
   CMP_OUT (path_attuned);
   CMP_OUT (path_repelled);
   CMP_OUT (path_denied);
-  CMP_OUT (material);
+  CMP_OUT2 (material, materials);//TODO: nuke
   CMP_OUT (materialname);
   CMP_OUT (value);
   CMP_OUT (carrying);