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

8
src/spell.c
View File

@@ -1203,7 +1203,7 @@ spelleffects_check(int spell, int *res, int *energy)
u.uen -= rnd(*energy);
if (u.uen < 0)
u.uen = 0;
display.botl = TRUE;
disp.botl = TRUE;
*res = ECMD_TIME;
return TRUE;
} else if (spellknow(spell) <= KEEN / 200) { /* 100 turns left */
@@ -1246,7 +1246,7 @@ spelleffects_check(int spell, int *res, int *energy)
u.uen -= rnd(2 * *energy);
if (u.uen < 0)
u.uen = 0;
display.botl = TRUE;
disp.botl = TRUE;
*res = ECMD_TIME; /* time is used even if spell doesn't get cast */
}
@@ -1320,7 +1320,7 @@ spelleffects_check(int spell, int *res, int *energy)
if (confused || (rnd(100) > chance)) {
You("fail to cast the spell correctly.");
u.uen -= *energy / 2;
display.botl = TRUE;
disp.botl = TRUE;
*res = ECMD_TIME;
return TRUE;
}
@@ -1343,7 +1343,7 @@ spelleffects(int spell_otyp, boolean atme, boolean force)
return res;
u.uen -= energy;
display.botl = TRUE;
disp.botl = TRUE;
exercise(A_WIS, TRUE);
/* pseudo is a temporary "false" object containing the spell stats */
pseudo = mksobj(force ? spell : spellid(spell), FALSE, FALSE);