--- deliantra/server/common/arch.C	2009/11/06 12:49:19	1.94
+++ deliantra/server/common/arch.C	2009/11/08 22:28:10	1.97
@@ -56,7 +56,7 @@
 //+GPL
 
 /*
- * Creates an object.  This function is called by get_archetype()
+ * Creates an object.  This function is called by get_archetype ()
  * if it fails to find the appropriate archetype.
  * Thus get_archetype() will be guaranteed to always return
  * an object, and never NULL.
@@ -351,6 +351,14 @@
     return i->second;
 }
 
+void
+archetype::post_load_check ()
+{
+  object::post_load_check ();
+
+  assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
+}
+
 archetype *
 archetype::read (object_thawer &f)
 {
@@ -594,7 +602,7 @@
  * Returns the first archetype using the given type.
  * Used in treasure-generation.
  */
-archetype *
+static archetype *
 type_to_archetype (int type)
 {
   for_all_archetypes (at)