--- deliantra/server/common/loader.C	2007/04/17 18:24:29	1.69
+++ deliantra/server/common/loader.C	2007/04/28 17:51:57	1.73
@@ -420,6 +420,7 @@
     { "fly_high", MOVE_FLY_HIGH },
     { "swim"    , MOVE_SWIM },
     { "boat"    , MOVE_BOAT },
+    { "ship"    , MOVE_SHIP },
     { "all"     , MOVE_ALL },
   };
 
@@ -475,13 +476,6 @@
 bool
 object::parse_kv (object_thawer &f)
 {
-  assert (f.kw == KW_object || f.kw == KW_arch);
-
-  if (f.kw == KW_object)
-    f.get (name); // preset name from object name
-
-  f.next ();
-
   object *op_inv = inv;
 
   for (;;)
@@ -841,6 +835,8 @@
           case KW_berserk:              GET_FLAG (this, FLAG_BERSERK); break;
           case KW_is_buildable:         GET_FLAG (this, FLAG_IS_BUILDABLE); break;
           case KW_destroy_on_death:     GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
+          case KW_treasure_env:         GET_FLAG (this, FLAG_TREASURE_ENV); break;
+          case KW_precious:             GET_FLAG (this, FLAG_PRECIOUS); break;
 
           case KW_armour:               f.get (resist[ATNR_PHYSICAL]); break;
           case KW_resist_physical:      f.get (resist[ATNR_PHYSICAL]); break;
@@ -992,6 +988,8 @@
 
   assert (arch); //D maybe use exception handling of sorts?
 
+  f.next ();
+
   object *op = object::create ();
 
   op->map = map;
@@ -1019,7 +1017,7 @@
 {
   object_thawer f (buf, (AV *)0);
 
-  f.kw = KW_arch; // special hack so that parse_kv skips
+  f.next ();
   return op->parse_kv (f);
 }
 
@@ -1110,7 +1108,7 @@
     KW_generator,
     KW_is_thrown,
     KW_auto_apply,
-    KW_NULL, // was KW_treasure
+    KW_treasure_env,
     KW_player_sold,
     /* 20 */
     KW_see_invisible,
@@ -1181,7 +1179,7 @@
     /* 80 */
     KW_has_ready_scroll,
     KW_can_use_rod,
-    KW_NULL,
+    KW_precious,
     KW_can_use_horn,
     KW_make_invisible,
     KW_inv_locked,
@@ -1402,11 +1400,14 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // generic resource file load,
-// currently supports: region, treasures
+// currently supports: region, treasures, archetypes
 bool load_resource_file (const char *filename)
 {
   object_thawer f (filename);
 
+  bool success   = false;
+  bool seen_arch = false;
+
   f.next ();
 
   for (;;)
@@ -1415,22 +1416,35 @@
         {
           case KW_region:
             if (!region::read (f))
-              return false;
+              goto finish;
             break;
 
           case KW_treasure:
           case KW_treasureone:
             if (!treasurelist::read (f))
-              return false;
+              goto finish;
+            break;
+
+          case KW_object:
+            seen_arch = true;
+            if (!archetype::read (f))
+              goto finish;
             break;
 
           case KW_EOF:
-            return true;
+            success = true;
+            goto finish;
 
           default:
             if (!f.parse_error ("resource file"))
-              return false;
+              goto finish;
         }
     }
+
+finish:
+  if (seen_arch)
+    init_archetype_pointers ();
+
+  return success;
 }