Revert "Modified objects initialization to support re-entry."
This reverts commit c3eefefc99.
This commit is contained in:
@@ -164,7 +164,7 @@ void NDECL(do_oracles);
|
||||
void NDECL(do_vision);
|
||||
|
||||
extern void NDECL(monst_init); /* monst.c */
|
||||
extern void NDECL(objects_globals_init); /* objects.c */
|
||||
extern void NDECL(objects_init); /* objects.c */
|
||||
|
||||
static void NDECL(link_sanity_check);
|
||||
static char *FDECL(name_file, (const char *, const char *));
|
||||
@@ -296,6 +296,7 @@ link_sanity_check()
|
||||
we're linked properly.
|
||||
*/
|
||||
monst_init();
|
||||
objects_init();
|
||||
|
||||
}
|
||||
|
||||
@@ -305,8 +306,6 @@ char *options;
|
||||
{
|
||||
boolean more_than_one;
|
||||
|
||||
objects_globals_init();
|
||||
|
||||
link_sanity_check();
|
||||
|
||||
/* construct the current version number */
|
||||
|
||||
Reference in New Issue
Block a user