First set of changes to move globals to instance_globals.

util/makedefs.c

@@ -176,7 +176,7 @@ void NDECL(do_fix_sampleconfig);
 #endif
 
 extern void NDECL(monst_init);   /* monst.c */
-extern void NDECL(objects_init); /* objects.c */
+extern void NDECL(objects_globals_init); /* objects.c */
 
 static void NDECL(link_sanity_check);
 static char *FDECL(name_file, (const char *, const char *));
@@ -308,7 +308,6 @@ link_sanity_check()
             we're linked properly.
     */
     monst_init();
-    objects_init();
 
 }
 
@@ -318,6 +317,8 @@ char *options;
 {
     boolean more_than_one;
 
+    objects_globals_init();
+
     link_sanity_check();
 
     /* construct the current version number */