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

36
src/do_wear.c
View File

@@ -213,7 +213,7 @@ Boots_on(void)
* so uarmf could be Null below; status line
* gets updated during brief interval they're
* worn so hero and player learn enchantment */
display.botl = TRUE; /* status hilites might mark AC changed */
disp.botl = TRUE; /* status hilites might mark AC changed */
makeknown(uarmf->otyp);
float_up();
if (Levitation)
@@ -428,7 +428,7 @@ Helmet_on(void)
but it takes trained arrogance to pull it off, and the actual
enchantment of the hat is irrelevant */
ABON(A_CHA) += (Role_if(PM_WIZARD) ? 1 : -1);
display.botl = TRUE;
disp.botl = TRUE;
makeknown(uarmh->otyp);
break;
case HELM_OF_OPPOSITE_ALIGNMENT:
@@ -460,7 +460,7 @@ Helmet_on(void)
else if (uarmh->bknown)
update_inventory(); /* keep bknown as-is; display the curse */
}
display.botl = TRUE; /* reveal new alignment or INT & WIS */
disp.botl = TRUE; /* reveal new alignment or INT & WIS */
if (Hallucination) {
pline("My brain hurts!"); /* Monty Python's Flying Circus */
} else if (uarmh && uarmh->otyp == DUNCE_CAP) {
@@ -499,12 +499,12 @@ Helmet_off(void)
case ORCISH_HELM:
break;
case DUNCE_CAP:
display.botl = TRUE;
disp.botl = TRUE;
break;
case CORNUTHAUM:
if (!gc.context.takeoff.cancelled_don) {
ABON(A_CHA) += (Role_if(PM_WIZARD) ? -1 : 1);
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case HELM_OF_TELEPATHY:
@@ -555,7 +555,7 @@ Gloves_on(void)
break;
case GAUNTLETS_OF_POWER:
makeknown(uarmg->otyp);
display.botl = TRUE; /* taken care of in attrib.c */
disp.botl = TRUE; /* taken care of in attrib.c */
break;
case GAUNTLETS_OF_DEXTERITY:
adj_abon(uarmg, uarmg->spe);
@@ -629,7 +629,7 @@ Gloves_off(void)
break;
case GAUNTLETS_OF_POWER:
makeknown(uarmg->otyp);
display.botl = TRUE; /* taken care of in attrib.c */
disp.botl = TRUE; /* taken care of in attrib.c */
break;
case GAUNTLETS_OF_DEXTERITY:
if (!gc.context.takeoff.cancelled_don)
@@ -664,7 +664,7 @@ Gloves_off(void)
wielding_corpse(uswapwep, gloves, on_purpose);
if (condtests[bl_bareh].enabled)
display.botl = TRUE;
disp.botl = TRUE;
return 0;
}
@@ -959,7 +959,7 @@ Amulet_on(void)
makeknown(AMULET_OF_CHANGE);
You("are suddenly very %s!",
flags.female ? "feminine" : "masculine");
display.botl = TRUE;
disp.botl = TRUE;
newsym(u.ux, u.uy); /* glyphmon flag and tile may have gone
* from male to female or vice versa */
} else {
@@ -978,7 +978,7 @@ Amulet_on(void)
if (can_be_strangled(&gy.youmonst)) {
makeknown(AMULET_OF_STRANGULATION);
Strangled = 6L;
display.botl = TRUE;
disp.botl = TRUE;
pline("It constricts your throat!");
}
break;
@@ -1005,7 +1005,7 @@ Amulet_on(void)
if (!already_flying) {
makeknown(AMULET_OF_FLYING);
display.botl = TRUE; /* status: 'Fly' On */
disp.botl = TRUE; /* status: 'Fly' On */
You("are now in flight.");
}
}
@@ -1053,7 +1053,7 @@ Amulet_off(void)
case AMULET_OF_STRANGULATION:
if (Strangled) {
Strangled = 0L;
display.botl = TRUE;
disp.botl = TRUE;
if (Breathless)
Your("%s is no longer constricted!", body_part(NECK));
else
@@ -1074,7 +1074,7 @@ Amulet_off(void)
float_vs_flight(); /* probably not needed here */
if (was_flying && !Flying) {
makeknown(AMULET_OF_FLYING);
display.botl = TRUE; /* status: 'Fly' Off */
disp.botl = TRUE; /* status: 'Fly' Off */
You("%s.", (is_pool_or_lava(u.ux, u.uy)
|| Is_waterlevel(&u.uz) || Is_airlevel(&u.uz))
? "stop flying"
@@ -1140,7 +1140,7 @@ adjust_attrib(struct obj *obj, int which, int val)
already discovered, both handled by learnring()] */
if (observable || !extremeattr(which))
learnring(obj, observable);
display.botl = TRUE;
disp.botl = TRUE;
}
void
@@ -2118,7 +2118,7 @@ accessory_or_armor_on(struct obj *obj)
You("are suddenly overcome with shame and change your mind.");
u.ublessed = 0; /* lose your god's protection */
makeknown(obj->otyp);
display.botl = TRUE; /* for AC after zeroing u.ublessed */
disp.botl = TRUE; /* for AC after zeroing u.ublessed */
return ECMD_TIME;
}
} else {
@@ -2391,7 +2391,7 @@ find_ac(void)
if (uac != u.uac) {
u.uac = uac;
display.botl = TRUE;
disp.botl = TRUE;
#if 0
/* these could conceivably be achieved out of order (by being near
threshold and putting on +N dragon scale mail from bones, for
@@ -3120,7 +3120,7 @@ adj_abon(register struct obj *otmp, register schar delta)
makeknown(uarmg->otyp);
ABON(A_DEX) += (delta);
}
display.botl = TRUE;
disp.botl = TRUE;
}
if (uarmh && uarmh == otmp && otmp->otyp == HELM_OF_BRILLIANCE) {
if (delta) {
@@ -3128,7 +3128,7 @@ adj_abon(register struct obj *otmp, register schar delta)
ABON(A_INT) += (delta);
ABON(A_WIS) += (delta);
}
display.botl = TRUE;
disp.botl = TRUE;
}
}