[ViewVC] Diff of: cvs/deliantra/server/common/arch.C

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.5 by root, Mon Aug 28 14:05:23 2006 UTC

 /*
  * static char *rcsid_arch_c =
- *   "$Id: arch.C,v 1.1 2006/08/13 17:16:00 elmex Exp $";
+ *   "$Id: arch.C,v 1.5 2006/08/28 14:05:23 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
 #include <global.h>
 #include <arch.h>
 #include <funcpoint.h>
 #include <loader.h>
+#include <cassert>
 /* IF set, does a little timing on the archetype load. */
 #define TIME_ARCH_LOAD 0
 static void add_arch(archetype *at);
 /*
  * Reads/parses the archetype-file, and copies into a linked list
  * of archetype-structures.
  */
-void first_arch_pass(FILE *fp) {
+void first_arch_pass(object_thawer &fp) {
     object *op;
     archetype *at,*head=NULL,*last_more=NULL;
     int i,first=2;
     op=get_object();
     clear_archetable();
     LOG(llevDebug," arch-pass 1...\n");
 #if TIME_ARCH_LOAD
 	GETTIMEOFDAY(&tv1);
 #endif
+    {
+      object_thawer thawer (fp);
-    first_arch_pass(fp);
+      first_arch_pass (thawer);
+    }
 #if TIME_ARCH_LOAD
     { int sec, usec;
 	GETTIMEOFDAY(&tv2);
 	sec = tv2.tv_sec - tv1.tv_sec;
 	usec = tv2.tv_usec - tv1.tv_usec;
       LOG(llevError,"Couldn't find archetype.\n");
     return NULL;
   }
   op=get_object();
   copy_object(&at->clone,op);
+  op->instantiate ();
   op->arch=at;
   return op;
 }
 /*
     LOG(llevError,"Can't clone archetype %d\n",type);
     free_object(op);
     return NULL;
   }
   copy_object(&at->clone,op);
+  op->instantiate ();
   return op;
 }
 /*
  * member: make instance from class

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines