Moved pray.c globals to instance_globals.

util/lev_main.c

@@ -108,9 +108,6 @@ struct lc_vardefs *FDECL(vardef_defined, (struct lc_vardefs *, char *, int));
 
 void FDECL(splev_add_from, (sp_lev *, sp_lev *));
 
-extern void NDECL(monst_init);
-extern void NDECL(objects_globals_init);
-
 void FDECL(add_opcode, (sp_lev *, int, genericptr_t));
 
 static boolean FDECL(write_common_data, (int));
@@ -258,11 +255,7 @@ char **argv;
 
     decl_globals_init();
     objects_globals_init();
-
-    /* Note:  these initializers don't do anything except guarantee that
-     *        we're linked properly.
-     */
-    monst_init();
+    monst_globals_init();
 
     /* this one does something... */
     init_obj_classes();

util/makedefs.c

@@ -175,10 +175,9 @@ void NDECL(do_vision);
 void NDECL(do_fix_sampleconfig);
 #endif
 
-extern void NDECL(monst_init);   /* monst.c */
+extern void NDECL(monst_globals_init);   /* monst.c */
 extern void NDECL(objects_globals_init); /* objects.c */
 
-static void NDECL(link_sanity_check);
 static char *FDECL(name_file, (const char *, const char *));
 static void FDECL(delete_file, (const char *template, const char *));
 static FILE *FDECL(getfp, (const char *, const char *, const char *));
@@ -301,16 +300,6 @@ char *argv[];
 
 #endif
 
-static void
-link_sanity_check()
-{
-    /* Note:  these initializers don't do anything except guarantee that
-            we're linked properly.
-    */
-    monst_init();
-
-}
-
 void
 do_makedefs(options)
 char *options;
@@ -318,8 +307,7 @@ char *options;
     boolean more_than_one;
 
     objects_globals_init();
-
-    link_sanity_check();
+    monst_globals_init();
 
     /* construct the current version number */
     make_version();
@@ -469,8 +457,6 @@ do_ext_makedefs(int argc, char **argv)
 {
     int todo = 0;
 
-    link_sanity_check();
-
     argc--;
     argv++; /* skip program name */