--- deliantra/server/common/object.C	2006/08/26 08:44:05	1.3
+++ deliantra/server/common/object.C	2006/08/28 14:05:23	1.6
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_object_c =
- *   "$Id: object.C,v 1.3 2006/08/26 08:44:05 root Exp $";
+ *   "$Id: object.C,v 1.6 2006/08/28 14:05:23 root Exp $";
  */
 
 /*
@@ -692,7 +692,7 @@
     free_key_values(op);
 
     *(object_special *)op = *(object_special *)op2;
-    op->clone (op2);
+    op2->clone (op);
 
     if(is_freed)	    SET_FLAG(op,FLAG_FREED);
     if(is_removed)	    SET_FLAG(op,FLAG_REMOVED);
@@ -2641,7 +2641,8 @@
         LOG(llevError,"Error - Unable to read object temp file\n");
         return NULL;
     };
-    load_object(tempfile,op,LO_NEWFILE,0);
+    object_thawer thawer (tempfile);
+    load_object(thawer,op,LO_NEWFILE,0);
     LOG(llevDebug," load str completed, object=%s\n",op->name);
     CLEAR_FLAG(op,FLAG_REMOVED);
     fclose(tempfile);