--- deliantra/server/common/loader.C	2008/04/20 00:44:12	1.109
+++ deliantra/server/common/loader.C	2008/05/02 21:01:53	1.113
@@ -21,10 +21,6 @@
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
-/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
-   sub/add_weight will transcend the environment updating the carrying
-   variable. */
-
 #include <global.h>
 #include <loader.h>
 #include <sproto.h>
@@ -1024,11 +1020,9 @@
 
   f.next ();
 
-  object *op = object::create ();
-
+  object *op = arch->instance ();
   op->map = map;
-  arch->copy_to (op);
-  // copy_to activates, this should be fixed properly
+  // instance() activates, this should be fixed properly
   op->deactivate ();
 
   if (!op->parse_kv (f))
@@ -1280,6 +1274,7 @@
   CMP_OUT (custom_name);
   CMP_OUT (title);
   CMP_OUT (race);
+  CMP_OUT (skill);
   CMP_OUT (slaying);
   CMP_OUT (tag);
   CMP_OUT (other_arch);
@@ -1410,7 +1405,7 @@
 bool
 object::write (object_freezer &f)
 {
-  archetype *at = arch ? (archetype *)arch : archetype::empty;
+  archetype *at = arch ? arch : archetype::empty;
 
   f.put (KW_arch, at->archname);
   write_diff (f, this, at);