nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'removemagic' of https://github.com/mkuoppal/NetHack into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2025-03-05 07:59:43 -05:00
parent 01cdf51993 25061dbce4
commit ebeebcc427
2 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/decl.h
View File

@@ -181,7 +181,6 @@ struct instance_globals_a {
struct h2o_ctx acid_ctx; struct h2o_ctx acid_ctx;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_b { struct instance_globals_b {
@@ -219,7 +218,6 @@ struct instance_globals_b {
boolean bot_disabled; boolean bot_disabled;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_c { struct instance_globals_c {
@@ -299,7 +297,6 @@ struct instance_globals_c {
/* zap.c */ /* zap.c */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_d { struct instance_globals_d {
@@ -345,7 +342,6 @@ struct instance_globals_d {
char *deferred_showpaths_dir; char *deferred_showpaths_dir;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_e { struct instance_globals_e {
@@ -366,7 +362,6 @@ struct instance_globals_e {
to gb.beyond_savefile_load */ to gb.beyond_savefile_load */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_f { struct instance_globals_f {
@@ -391,7 +386,6 @@ struct instance_globals_f {
long int followmsg; /* last time of follow message */ long int followmsg; /* last time of follow message */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_g { struct instance_globals_g {
@@ -439,7 +433,6 @@ struct instance_globals_g {
long glyphmap_perlevel_flags; long glyphmap_perlevel_flags;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_h { struct instance_globals_h {
@@ -460,7 +453,6 @@ struct instance_globals_h {
struct attack *hitmsg_prev; struct attack *hitmsg_prev;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_i { struct instance_globals_i {
@@ -494,7 +486,6 @@ struct instance_globals_i {
/* new */ /* new */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_j { struct instance_globals_j {
@@ -503,7 +494,6 @@ struct instance_globals_j {
int jumping_is_magic; /* current jump result of magic */ int jumping_is_magic; /* current jump result of magic */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_k { struct instance_globals_k {
@@ -517,7 +507,6 @@ struct instance_globals_k {
boolean known; boolean known;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_l { struct instance_globals_l {
@@ -583,7 +572,6 @@ struct instance_globals_l {
char lua_copyright[LUA_COPYRIGHT_BUFSIZ]; char lua_copyright[LUA_COPYRIGHT_BUFSIZ];
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_m { struct instance_globals_m {
@@ -650,7 +638,6 @@ struct instance_globals_m {
* POT_WATER should become discovered */ * POT_WATER should become discovered */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_n { struct instance_globals_n {
@@ -700,7 +687,6 @@ struct instance_globals_n {
short nocreate4; short nocreate4;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_o { struct instance_globals_o {
@@ -759,7 +745,6 @@ struct instance_globals_o {
boolean obj_zapped; boolean obj_zapped;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_p { struct instance_globals_p {
@@ -810,13 +795,11 @@ struct instance_globals_p {
/* new stuff */ /* new stuff */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_q { struct instance_globals_q {
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_r { struct instance_globals_r {
@@ -845,7 +828,6 @@ struct instance_globals_r {
struct repo repo; struct repo repo;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_s { struct instance_globals_s {
@@ -927,7 +909,6 @@ struct instance_globals_s {
int seethru; /* 'bubble' debugging: clouds and water don't block light */ int seethru; /* 'bubble' debugging: clouds and water don't block light */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_t { struct instance_globals_t {
@@ -978,7 +959,6 @@ struct instance_globals_t {
int twohits; /* 0: single hit; 1: first of 2; 2: second of 2 */ int twohits; /* 0: single hit; 1: first of 2; 2: second of 2 */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_u { struct instance_globals_u {
@@ -998,7 +978,6 @@ struct instance_globals_u {
/* new stuff */ /* new stuff */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_v { struct instance_globals_v {
@@ -1035,7 +1014,6 @@ struct instance_globals_v {
struct sound_voice voice; struct sound_voice voice;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_w { struct instance_globals_w {
@@ -1064,7 +1042,6 @@ struct instance_globals_w {
long were_changes; /* were.c, allmain.c */ long were_changes; /* were.c, allmain.c */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_x { struct instance_globals_x {
@@ -1085,7 +1062,6 @@ struct instance_globals_x {
coordxy xstart, xsize; coordxy xstart, xsize;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_y { struct instance_globals_y {
@@ -1103,7 +1079,6 @@ struct instance_globals_y {
coordxy ystart, ysize; coordxy ystart, ysize;
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_z { struct instance_globals_z {
@@ -1120,7 +1095,6 @@ struct instance_globals_z {
* remember who zapped the wand. */ * remember who zapped the wand. */
boolean havestate; boolean havestate;
unsigned long magic; /* validate that structure layout is preserved */
}; };
struct instance_globals_saved_b { struct instance_globals_saved_b {

34
src/decl.c
View File

@@ -146,8 +146,6 @@ NEARDATA long yn_number = 0L;
const char *ARGV0; const char *ARGV0;
#endif #endif
#define IVMAGIC 0xdeadbeef
static const struct Role urole_init_data = { static const struct Role urole_init_data = {
{ "Undefined", 0 }, { "Undefined", 0 },
{ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
@@ -228,7 +226,6 @@ static const struct instance_globals_a g_init_a = {
/* trap.c */ /* trap.c */
{ 0, 0, FALSE }, /* acid_ctx */ { 0, 0, FALSE }, /* acid_ctx */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* a_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_b g_init_b = { static const struct instance_globals_b g_init_b = {
@@ -261,7 +258,6 @@ static const struct instance_globals_b g_init_b = {
FALSE, /* bot_disabled */ FALSE, /* bot_disabled */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* b_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_c g_init_c = { static const struct instance_globals_c g_init_c = {
@@ -312,7 +308,6 @@ static const struct instance_globals_c g_init_c = {
/* uhitm.c */ /* uhitm.c */
NON_PM, /* corpsenm_digested */ NON_PM, /* corpsenm_digested */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* c_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_d g_init_d = { static const struct instance_globals_d g_init_d = {
@@ -342,7 +337,6 @@ static const struct instance_globals_d g_init_d = {
FALSE, /* deferred_showpaths */ FALSE, /* deferred_showpaths */
NULL, /* deferred_showpaths_dir */ NULL, /* deferred_showpaths_dir */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* d_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_e g_init_e = { static const struct instance_globals_e g_init_e = {
@@ -357,7 +351,6 @@ static const struct instance_globals_e g_init_e = {
/* new */ /* new */
0, /* early_raw_messages */ 0, /* early_raw_messages */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* e_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_f g_init_f = { static const struct instance_globals_f g_init_f = {
@@ -376,7 +369,6 @@ static const struct instance_globals_f g_init_f = {
/* shk.c */ /* shk.c */
0L, /* followmsg */ 0L, /* followmsg */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* f_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_g g_init_g = { static const struct instance_globals_g g_init_g = {
@@ -413,7 +405,6 @@ static const struct instance_globals_g g_init_g = {
/* per-level glyph mapping flags */ /* per-level glyph mapping flags */
0L, /* glyphmap_perlevel_flags */ 0L, /* glyphmap_perlevel_flags */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* g_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_h g_init_h = { static const struct instance_globals_h g_init_h = {
@@ -432,7 +423,6 @@ static const struct instance_globals_h g_init_h = {
NULL, /* hitmsg_prev */ NULL, /* hitmsg_prev */
/* save.c */ /* save.c */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* h_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_i g_init_i = { static const struct instance_globals_i g_init_i = {
@@ -455,14 +445,12 @@ static const struct instance_globals_i g_init_i = {
FALSE, /* in_mk_themerooms */ FALSE, /* in_mk_themerooms */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* i_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_j g_init_j = { static const struct instance_globals_j g_init_j = {
/* apply.c */ /* apply.c */
0, /* jumping_is_magic */ 0, /* jumping_is_magic */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* j_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_k g_init_k = { static const struct instance_globals_k g_init_k = {
@@ -472,7 +460,6 @@ static const struct instance_globals_k g_init_k = {
/* read.c */ /* read.c */
UNDEFINED_VALUE, /* known */ UNDEFINED_VALUE, /* known */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* k_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_l g_init_l = { static const struct instance_globals_l g_init_l = {
@@ -522,7 +509,6 @@ static const struct instance_globals_l g_init_l = {
DUMMY, /* lua_ver[LUA_VER_BUFSIZ] */ DUMMY, /* lua_ver[LUA_VER_BUFSIZ] */
DUMMY, /* lua_copyright[LUA_COPYRIGHT_BUFSIZ] */ DUMMY, /* lua_copyright[LUA_COPYRIGHT_BUFSIZ] */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* l_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_m g_init_m = { static const struct instance_globals_m g_init_m = {
@@ -571,7 +557,6 @@ static const struct instance_globals_m g_init_m = {
/* trap.c */ /* trap.c */
FALSE, /* mentioned_water */ FALSE, /* mentioned_water */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* m_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_n g_init_n = { static const struct instance_globals_n g_init_n = {
@@ -606,7 +591,6 @@ static const struct instance_globals_n g_init_n = {
STRANGE_OBJECT, /* nocreate3 */ STRANGE_OBJECT, /* nocreate3 */
STRANGE_OBJECT, /* nocreate4 */ STRANGE_OBJECT, /* nocreate4 */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* n_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_o g_init_o = { static const struct instance_globals_o g_init_o = {
@@ -650,7 +634,6 @@ static const struct instance_globals_o g_init_o = {
/* zap.c */ /* zap.c */
FALSE, /* obj_zapped */ FALSE, /* obj_zapped */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* o_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_p g_init_p = { static const struct instance_globals_p g_init_p = {
@@ -686,12 +669,10 @@ static const struct instance_globals_p g_init_p = {
/* zap.c */ /* zap.c */
UNDEFINED_VALUE, /* poly_zap */ UNDEFINED_VALUE, /* poly_zap */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* p_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_q g_init_q = { static const struct instance_globals_q g_init_q = {
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* q_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_r g_init_r = { static const struct instance_globals_r g_init_r = {
@@ -712,7 +693,6 @@ static const struct instance_globals_r g_init_r = {
/* shk.c */ /* shk.c */
UNDEFINED_VALUES, /* repo */ UNDEFINED_VALUES, /* repo */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* r_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_s g_init_s = { static const struct instance_globals_s g_init_s = {
@@ -769,7 +749,6 @@ static const struct instance_globals_s g_init_s = {
/* vision.c */ /* vision.c */
0, /* seethru */ 0, /* seethru */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* s_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_t g_init_t = { static const struct instance_globals_t g_init_t = {
@@ -804,7 +783,6 @@ static const struct instance_globals_t g_init_t = {
0, /* twohits */ 0, /* twohits */
/**/ /**/
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* t_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_u g_init_u = { static const struct instance_globals_u g_init_u = {
@@ -818,7 +796,6 @@ static const struct instance_globals_u g_init_u = {
/* save.c */ /* save.c */
{ 0, 0 }, /* uz_save */ { 0, 0 }, /* uz_save */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* u_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_v g_init_v = { static const struct instance_globals_v g_init_v = {
@@ -844,7 +821,6 @@ static const struct instance_globals_v g_init_v = {
FALSE, /* vision_full_recalc */ FALSE, /* vision_full_recalc */
UNDEFINED_VALUES, /* voice */ UNDEFINED_VALUES, /* voice */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* v_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_w g_init_w = { static const struct instance_globals_w g_init_w = {
@@ -865,7 +841,6 @@ static const struct instance_globals_w g_init_w = {
{ wdmode_traditional, NO_COLOR }, /* wsettings */ { wdmode_traditional, NO_COLOR }, /* wsettings */
0L, /* were.c, allmain.c */ 0L, /* were.c, allmain.c */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* w_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_x g_init_x = { static const struct instance_globals_x g_init_x = {
@@ -879,7 +854,6 @@ static const struct instance_globals_x g_init_x = {
UNDEFINED_VALUE, /* xstart */ UNDEFINED_VALUE, /* xstart */
UNDEFINED_VALUE, /* xsize */ UNDEFINED_VALUE, /* xsize */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* x_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_y g_init_y = { static const struct instance_globals_y g_init_y = {
@@ -893,7 +867,6 @@ static const struct instance_globals_y g_init_y = {
UNDEFINED_VALUE, /* ystart */ UNDEFINED_VALUE, /* ystart */
UNDEFINED_VALUE, /* ysize */ UNDEFINED_VALUE, /* ysize */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* y_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_z g_init_z = { static const struct instance_globals_z g_init_z = {
@@ -902,7 +875,6 @@ static const struct instance_globals_z g_init_z = {
/* muse.c */ /* muse.c */
FALSE, /* zap_oseen */ FALSE, /* zap_oseen */
TRUE, /* havestate*/ TRUE, /* havestate*/
IVMAGIC /* z_magic to validate that structure layout has been preserved */
}; };
static const struct instance_globals_saved_b init_svb = { static const struct instance_globals_saved_b init_svb = {
@@ -1097,12 +1069,6 @@ const struct const_globals cg = {
#define MAGICCHECK(xx) \ #define MAGICCHECK(xx) \
do { \ do { \
if ((xx).magic != IVMAGIC) { \
raw_printf( \
"decl_globals_init: %s.magic in unexpected state (%lx).", \
#xx, (xx).magic); \
exit(1); \
} \
if ((xx).havestate != TRUE) { \ if ((xx).havestate != TRUE) { \
raw_printf( \ raw_printf( \
"decl_globals_init: %s.havestate not True.", #xx); \ "decl_globals_init: %s.havestate not True.", #xx); \