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

16
src/shk.c
View File

@@ -124,7 +124,7 @@ money2mon(struct monst* mon, long amount)
remove_worn_item(ygold, FALSE); /* quiver */
freeinv(ygold);
add_to_minv(mon, ygold);
display.botl = TRUE;
disp.botl = TRUE;
return amount;
}
@@ -158,7 +158,7 @@ money2u(struct monst* mon, long amount)
dropy(mongold);
} else {
addinv(mongold);
display.botl = TRUE;
disp.botl = TRUE;
}
}
@@ -1179,7 +1179,7 @@ pay(long tmp, register struct monst* shkp)
money2mon(shkp, balance);
else if (balance < 0)
money2u(shkp, -balance);
display.botl = TRUE;
disp.botl = TRUE;
if (robbed) {
robbed -= tmp;
if (robbed < 0)
@@ -1674,7 +1674,7 @@ dopay(void)
eshkp->debit = 0L;
eshkp->loan = 0L;
You("pay that debt.");
display.botl = TRUE;
disp.botl = TRUE;
} else {
dtmp -= eshkp->credit;
eshkp->credit = 0L;
@@ -1683,7 +1683,7 @@ dopay(void)
eshkp->loan = 0L;
pline("That debt is partially offset by your credit.");
You("pay the remainder.");
display.botl = TRUE;
disp.botl = TRUE;
}
paid = TRUE;
}
@@ -2098,14 +2098,14 @@ inherits(
eshkp->robbed = 0L;
if (umoney > 0L) {
money2mon(shkp, umoney);
display.botl = TRUE;
disp.botl = TRUE;
}
if (!silently)
pline("%s %s all your possessions.", Shknam(shkp), takes);
taken = TRUE;
} else {
money2mon(shkp, loss);
display.botl = TRUE;
disp.botl = TRUE;
if (!silently)
pline("%s %s the %ld %s %sowed %s.", Shknam(shkp),
takes, loss, currency(loss),
@@ -4730,7 +4730,7 @@ pay_for_damage(const char *dmgstr, boolean cant_mollify)
cost_of_damage = check_credit(cost_of_damage, shkp);
if (cost_of_damage > 0L) {
money2mon(shkp, cost_of_damage);
display.botl = TRUE;
disp.botl = TRUE;
}
pline("Mollified, %s accepts your restitution.", shkname(shkp));
/* move shk back to his home loc */