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

variable 'display' causes shadow variable warnings in X11 build

Browse Source 
display.botl      -> disp.botl
display.botlx     -> disp.botlx
display.time_botl -> disp.time_botl
This commit is contained in:
nhmall
2024-01-05 05:58:51 -05:00
parent f8230eff4b
commit 4e19221e55
45 changed files with 249 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/polyself.c
View File

@@ -143,7 +143,7 @@ float_vs_flight(void)
might cause a change in stealth */
steed_vs_stealth();
display.botl = TRUE;
disp.botl = TRUE;
}
/* riding blocks stealth unless hero+steed fly */
@@ -169,7 +169,7 @@ check_strangling(boolean on)
if (uamul && uamul->otyp == AMULET_OF_STRANGULATION
&& can_be_strangled(&gy.youmonst)) {
Strangled = 6L;
display.botl = TRUE;
disp.botl = TRUE;
Your("%s %s your %s!", simpleonames(uamul),
was_strangled ? "still constricts" : "begins constricting",
body_part(NECK)); /* "throat" */
@@ -180,7 +180,7 @@ check_strangling(boolean on)
} else {
if (Strangled && !can_be_strangled(&gy.youmonst)) {
Strangled = 0L;
display.botl = TRUE;
disp.botl = TRUE;
You("are no longer being strangled.");
}
}
@@ -445,7 +445,7 @@ newman(void)
make_slimed(10L, (const char *) 0);
}
display.botl = TRUE;
disp.botl = TRUE;
see_monsters();
(void) encumber_msg();
@@ -640,7 +640,7 @@ polyself(int psflags)
of evaporation due to over enchanting */
uarm->otyp += GRAY_DRAGON_SCALES - GRAY_DRAGON_SCALE_MAIL;
uarm->dknown = 1;
display.botl = TRUE; /* AC is changing */
disp.botl = TRUE; /* AC is changing */
}
uskin = uarm;
uarm = (struct obj *) 0;
@@ -1002,7 +1002,7 @@ polymon(int mntmp)
}
check_strangling(TRUE); /* maybe start strangling */
display.botl = TRUE;
disp.botl = TRUE;
gv.vision_full_recalc = 1;
see_monsters();
(void) encumber_msg();
@@ -1380,7 +1380,7 @@ rehumanize(void)
}
nomul(0);
display.botl = TRUE;
disp.botl = TRUE;
gv.vision_full_recalc = 1;
(void) encumber_msg();
if (was_flying && !Flying && u.usteed)
@@ -1405,7 +1405,7 @@ dobreathe(void)
return ECMD_OK;
}
u.uen -= 15;
display.botl = TRUE;
disp.botl = TRUE;
if (!getdir((char *) 0))
return ECMD_CANCEL;
@@ -1602,7 +1602,7 @@ dosummon(void)
return ECMD_OK;
}
u.uen -= 10;
display.botl = TRUE;
disp.botl = TRUE;
You("call upon your brethren for help!");
exercise(A_WIS, TRUE);
@@ -1643,7 +1643,7 @@ dogaze(void)
return ECMD_OK;
}
u.uen -= 15;
display.botl = TRUE;
disp.botl = TRUE;
for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
if (DEADMONSTER(mtmp))
@@ -1878,7 +1878,7 @@ domindblast(void)
return ECMD_OK;
}
u.uen -= 10;
display.botl = TRUE;
disp.botl = TRUE;
You("concentrate.");
pline("A wave of psychic energy pours out.");
@@ -2158,7 +2158,7 @@ ugolemeffects(int damtype, int dam)
u.mh += heal;
if (u.mh > u.mhmax)
u.mh = u.mhmax;
display.botl = TRUE;
disp.botl = TRUE;
pline("Strangely, you feel better than before.");
exercise(A_STR, TRUE);
}