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

remove unused globals: save_cm, was_waterlevel

Browse Source 
From entrez.  Since restoring was removed separately it was easier
to edit the files manually than to use his diff.
This commit is contained in:
PatR
2021-10-12 11:41:56 -07:00
parent 9c667501b6
commit 5350f049b2
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/decl.h
View File

@@ -772,7 +772,6 @@ struct instance_globals {
stairway *stairs; stairway *stairs;
int smeq[MAXNROFROOMS + 1]; int smeq[MAXNROFROOMS + 1];
int doorindex; int doorindex;
char *save_cm;
long done_money; long done_money;
long domove_attempting; long domove_attempting;
long domove_succeeded; long domove_succeeded;
@@ -997,7 +996,6 @@ struct instance_globals {
/* mkmaze.c */ /* mkmaze.c */
lev_region bughack; /* for preserving the insect legs when wallifying lev_region bughack; /* for preserving the insect legs when wallifying
* baalz level */ * baalz level */
boolean was_waterlevel; /* ugh... this shouldn't be needed */
struct bubble *bbubbles; struct bubble *bbubbles;
struct bubble *ebubbles; struct bubble *ebubbles;
struct trap *wportal; struct trap *wportal;

8
src/cmd.c
View File

@@ -4502,13 +4502,9 @@ parse(void)
} }
g.multi = g.command_count; g.multi = g.command_count;
if (g.multi)
if (g.multi) {
g.multi--; g.multi--;
g.save_cm = g.command_line;
} else {
g.save_cm = (char *) 0;
}
/* in 3.4.3 this was in rhack(), where it was too late to handle M-5 */ /* in 3.4.3 this was in rhack(), where it was too late to handle M-5 */
if (g.Cmd.pcHack_compat) { if (g.Cmd.pcHack_compat) {
/* This handles very old inconsistent DOS/Windows behaviour /* This handles very old inconsistent DOS/Windows behaviour

2
src/decl.c
View File

@@ -262,7 +262,6 @@ const struct instance_globals g_init = {
NULL, /* stairs */ NULL, /* stairs */
DUMMY, /* smeq */ DUMMY, /* smeq */
0, /* doorindex */ 0, /* doorindex */
NULL, /* save_cm */
0, /* done_money */ 0, /* done_money */
0L, /* domove_attempting */ 0L, /* domove_attempting */
0L, /* domove_succeeded */ 0L, /* domove_succeeded */
@@ -466,7 +465,6 @@ const struct instance_globals g_init = {
/* mkmaze.c */ /* mkmaze.c */
{ {COLNO, ROWNO, 0, 0}, {COLNO, ROWNO, 0, 0} }, /* bughack */ { {COLNO, ROWNO, 0, 0}, {COLNO, ROWNO, 0, 0} }, /* bughack */
FALSE, /* was_waterlevel */
UNDEFINED_PTR, /* bbubbles */ UNDEFINED_PTR, /* bbubbles */
UNDEFINED_PTR, /* ebubbles */ UNDEFINED_PTR, /* ebubbles */
UNDEFINED_PTR, /* wportal */ UNDEFINED_PTR, /* wportal */