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

avoid use of variables near and far

Browse Source 
Some recent testing with a multi-platform compiler encountered difficulty
with the use of a variable 'near' (and presumably 'far', but we don't have
any of those in the source tree) due to reserved word extensions.

Avoid using that as a variable name.
This commit is contained in:
nhmall
2022-11-10 11:18:49 -05:00
parent ea163f8865
commit 88a0153a6e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/teleport.c
View File

@@ -1338,14 +1338,14 @@ rloc_to_core(
if (domsg && (canspotmon(mtmp) || appearmsg)) {
int du = distu(x, y), olddu;
const char *next = (du <= 2) ? " next to you" : 0, /* next2u() */
*near = (du <= BOLT_LIM * BOLT_LIM) ? " close by" : 0;
*nearu = (du <= BOLT_LIM * BOLT_LIM) ? " close by" : 0;
mtmp->mstrategy &= ~STRAT_APPEARMSG; /* one chance only */
if (telemsg && (couldsee(x, y) || sensemon(mtmp))) {
pline("%s vanishes and reappears%s.",
Monnam(mtmp),
next ? next
: near ? near
: nearu ? nearu
: ((olddu = distu(oldx, oldy)) == du) ? ""
: (du < olddu) ? " closer to you"
: " farther away");
@@ -1354,7 +1354,7 @@ rloc_to_core(
appearmsg ? Amonnam(mtmp) : Monnam(mtmp),
appearmsg ? "suddenly " : "",
!Blind ? "appears" : "arrives",
next ? next : near ? near : "");
next ? next : nearu ? nearu : "");
}
}