Revert "Modified objects initialization to support re-entry."

This reverts commit c3eefefc99.
This commit is contained in:
nhmall
2018-11-23 22:16:24 -05:00
parent efdfd2fa1d
commit 3cbc6d4cf5
13 changed files with 30 additions and 26 deletions

View File

@@ -33,7 +33,9 @@ boolean resuming;
/* Note: these initializers don't do anything except guarantee that
we're linked properly.
*/
decl_init();
monst_init();
objects_init();
/* if a save file created in normal mode is now being restored in
explore mode, treat it as normal restore followed by 'X' command

View File

@@ -318,6 +318,13 @@ const char *ARGV0;
/* support for lint.h */
unsigned nhUse_dummy = 0;
/* dummy routine used to force linkage */
void
decl_init()
{
return;
}
#define IVMAGIC 0xdeadbeef
const struct instance_globals g_init = {
@@ -413,7 +420,7 @@ const struct instance_globals g_init = {
struct instance_globals g;
void
decl_globals_init()
instance_globals_init()
{
g = g_init;

View File

@@ -61,7 +61,7 @@ struct monst { struct monst *dummy; }; /* lint: struct obj's union */
cost,sdam,ldam,oc1,oc2,nut,color) { obj }
#define None (char *) 0 /* less visual distraction for 'no description' */
NEARDATA struct objdescr obj_descr_init[] =
NEARDATA struct objdescr obj_descr[] =
#else
/* second pass -- object definitions */
#define BITS(nmkn,mrg,uskn,ctnr,mgc,chrg,uniq,nwsh,big,tuf,dir,sub,mtrl) \
@@ -75,7 +75,7 @@ NEARDATA struct objdescr obj_descr_init[] =
#define HARDGEM(n) (0)
#endif
NEARDATA struct objclass obj_init[] =
NEARDATA struct objclass objects[] =
#endif
{
/* dummy object[0] -- description [2nd arg] *must* be NULL */
@@ -1169,14 +1169,13 @@ OBJECT(OBJ(None, None),
/* clang-format on */
/* *INDENT-ON* */
struct objdescr obj_descr[SIZE(obj_descr_init)];
struct objclass objects[SIZE(obj_init)];
void NDECL(objects_init);
/* dummy routine used to force linkage */
void
objects_globals_init()
objects_init()
{
memcpy(obj_descr, obj_descr_init, sizeof(obj_descr));
memcpy(objects, obj_init, sizeof(objects));
return;
}
#endif /* !OBJECTS_PASS_2_ */

View File

@@ -20,9 +20,6 @@ struct sysopt sysopt;
void
sys_early_init()
{
decl_globals_init();
objects_globals_init();
sysopt.support = (char *) 0;
sysopt.recover = (char *) 0;
#ifdef SYSCF