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

This commit is contained in:
nhmall
2025-03-05 07:59:43 -05:00
2 changed files with 0 additions and 60 deletions

View File

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