--- deliantra/server/common/object.C	2006/08/26 23:36:30	1.4
+++ deliantra/server/common/object.C	2006/08/29 05:03:54	1.7
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_object_c =
- *   "$Id: object.C,v 1.4 2006/08/26 23:36:30 root Exp $";
+ *   "$Id: object.C,v 1.7 2006/08/29 05:03:54 root Exp $";
  */
 
 /*
@@ -548,7 +548,6 @@
     op->msg = NULL;
     op->materialname = NULL;
     op->lore = NULL;
-    op->current_weapon_script = NULL;
     clear_object(op);
 }
 
@@ -2641,7 +2640,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);