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

30
src/zap.c
View File

@@ -1197,19 +1197,19 @@ cancel_item(struct obj *obj)
case RIN_GAIN_STRENGTH:
if ((obj->owornmask & W_RING) != 0L) {
ABON(A_STR) -= obj->spe;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case RIN_GAIN_CONSTITUTION:
if ((obj->owornmask & W_RING) != 0L) {
ABON(A_CON) -= obj->spe;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case RIN_ADORNMENT:
if ((obj->owornmask & W_RING) != 0L) {
ABON(A_CHA) -= obj->spe;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case RIN_INCREASE_ACCURACY:
@@ -1222,24 +1222,24 @@ cancel_item(struct obj *obj)
break;
case RIN_PROTECTION:
if ((obj->owornmask & W_RING) != 0L)
display.botl = TRUE;
disp.botl = TRUE;
break;
case GAUNTLETS_OF_DEXTERITY:
if ((obj->owornmask & W_ARMG) != 0L) {
ABON(A_DEX) -= obj->spe;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case HELM_OF_BRILLIANCE:
if ((obj->owornmask & W_ARMH) != 0L) {
ABON(A_INT) -= obj->spe;
ABON(A_WIS) -= obj->spe;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
default:
if ((obj->owornmask & W_ARMOR) != 0L) /* AC */
display.botl = TRUE;
disp.botl = TRUE;
break;
}
}
@@ -1337,19 +1337,19 @@ drain_item(struct obj *obj, boolean by_you)
case RIN_GAIN_STRENGTH:
if ((obj->owornmask & W_RING) && u_ring) {
ABON(A_STR)--;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case RIN_GAIN_CONSTITUTION:
if ((obj->owornmask & W_RING) && u_ring) {
ABON(A_CON)--;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case RIN_ADORNMENT:
if ((obj->owornmask & W_RING) && u_ring) {
ABON(A_CHA)--;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case RIN_INCREASE_ACCURACY:
@@ -1362,25 +1362,25 @@ drain_item(struct obj *obj, boolean by_you)
break;
case RIN_PROTECTION:
if (u_ring)
display.botl = TRUE; /* bot() will recalc u.uac */
disp.botl = TRUE; /* bot() will recalc u.uac */
break;
case HELM_OF_BRILLIANCE:
if ((obj->owornmask & W_ARMH) && (obj == uarmh)) {
ABON(A_INT)--;
ABON(A_WIS)--;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
case GAUNTLETS_OF_DEXTERITY:
if ((obj->owornmask & W_ARMG) && (obj == uarmg)) {
ABON(A_DEX)--;
display.botl = TRUE;
disp.botl = TRUE;
}
break;
default:
break;
}
if (display.botl)
if (disp.botl)
bot();
if (carried(obj))
update_inventory();
@@ -3047,7 +3047,7 @@ cancel_monst(struct monst *mdef, struct obj *obj, boolean youattack,
cancel_item(otmp);
if (youdefend) {
display.botl = TRUE; /* potential AC change */
disp.botl = TRUE; /* potential AC change */
find_ac();
/* update_inventory(); -- handled by caller */
}