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

Remove the 'nul' variable.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-18 23:51:08 -05:00
parent 72c2ae233d
commit a3b1cb8432
8 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/decl.h
View File

@@ -196,7 +196,6 @@ E NEARDATA char horsename[];
E char preferred_pet;
E const char *occtxt; /* defined when occupation != NULL */
E const char *nomovemsg;
E const char nul[];
E char lock[];
E const schar xdir[], ydir[], zdir[];

1
src/decl.c
View File

@@ -52,7 +52,6 @@ NEARDATA struct kinfo killer = DUMMY;
NEARDATA long done_money = 0;
#endif
const char *nomovemsg = 0;
const char nul[40] = DUMMY; /* contains zeros */
NEARDATA char plname[PL_NSIZ] = DUMMY; /* player name */
NEARDATA char pl_character[PL_CSIZ] = DUMMY;
NEARDATA char pl_race = '\0';

2
src/dig.c
View File

@@ -1855,7 +1855,7 @@ long timeout; /* unused */
char *cname = corpse_xname(obj, (const char *)0, CXN_NO_PFX);
Your("%s%s %s away%c",
obj == uwep ? "wielded " : nul, cname,
obj == uwep ? "wielded " : "", cname,
otense(obj, "rot"), obj == uwep ? '!' : '.');
}
if (obj == uwep) {

2
src/eat.c
View File

@@ -691,7 +691,7 @@ register int pm;
if (!Slimed && !Unchanging && !slimeproof(youmonst.data)) {
You("don't feel very well.");
make_slimed(10L, (char*) 0);
delayed_killer(SLIMED, KILLED_BY_AN, nul);
delayed_killer(SLIMED, KILLED_BY_AN, "");
}
/* Fall through */
default:

2
src/hack.c
View File

@@ -207,7 +207,7 @@ moverock()
pline("%s%s and %s a %s in the %s!",
Tobjnam(otmp,
(ttmp->ttyp == TRAPDOOR) ? "trigger" : "fall"),
(ttmp->ttyp == TRAPDOOR) ? nul : " into",
(ttmp->ttyp == TRAPDOOR) ? "" : " into",
otense(otmp, "plug"),
(ttmp->ttyp == TRAPDOOR) ? "trap door" : "hole",
surface(rx, ry));

2
src/mthrowu.c
View File

@@ -412,7 +412,7 @@ struct obj *obj; /* missile (or stack providing it) */
if (!Stoned && !Stone_resistance
&& !(poly_when_stoned(youmonst.data) &&
polymon(PM_STONE_GOLEM))) {
make_stoned(5L, (char *)0, KILLED_BY, nul);
make_stoned(5L, (char *)0, KILLED_BY, "");
}
}
stop_occupation();

16
src/read.c
View File

@@ -228,7 +228,7 @@ register const char *color;
pline("%s%s%s for a moment.",
Yobjnam2(otmp, Blind ? "vibrate" : "glow"),
Blind ? "" : " ",
Blind ? nul : hcolor(color));
Blind ? "" : hcolor(color));
}
/* Is the object chargeable? For purposes of inventory display; it is */
@@ -806,8 +806,8 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
pline("%s violently %s%s%s for a while, then %s.",
Yname2(otmp),
otense(otmp, Blind ? "vibrate" : "glow"),
(!Blind && !same_color) ? " " : nul,
(Blind || same_color) ? nul :
(!Blind && !same_color) ? " " : "",
(Blind || same_color) ? "" :
hcolor(scursed ? NH_BLACK : NH_SILVER),
otense(otmp, "evaporate"));
remove_worn_item(otmp, FALSE);
@@ -836,10 +836,10 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
}
pline("%s %s%s%s%s for a %s.",
Yname2(otmp),
s == 0 ? "violently " : nul,
s == 0 ? "violently " : "",
otense(otmp, Blind ? "vibrate" : "glow"),
(!Blind && !same_color) ? " " : nul,
(Blind || same_color) ? nul :
(!Blind && !same_color) ? " " : "",
(Blind || same_color) ? "" :
hcolor(scursed ? NH_BLACK : NH_SILVER),
(s * s > 1) ? "while" : "moment");
/* [this cost handling will need updating if shop pricing is
@@ -914,11 +914,11 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
Your("%s begin to %s%s.",
makeplural(body_part(HAND)),
Blind ? "tingle" : "glow ",
Blind ? nul : hcolor(NH_PURPLE));
Blind ? "" : hcolor(NH_PURPLE));
make_confused(HConfusion + rnd(100),FALSE);
} else {
pline("A %s%s surrounds your %s.",
Blind ? nul : hcolor(NH_RED),
Blind ? "" : hcolor(NH_RED),
Blind ? "faint buzz" : " glow",
body_part(HEAD));
make_confused(0L,TRUE);

6
src/save.c
View File

@@ -73,11 +73,7 @@ static struct save_procs {
#endif
};
#ifdef GCC_WARN
static long nulls[10];
#else
#define nulls nul
#endif
static long nulls[sizeof(struct trap) + sizeof(struct fruit)];
#if defined(UNIX) || defined(VMS) || defined(__EMX__) || defined(WIN32)
#define HUP if (!program_state.done_hup)