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

Merge branch 'NetHack-3.6.2-beta01' into macosx-curses-fall2018

Browse Source
This commit is contained in:
nhmall
2018-11-19 09:58:40 -05:00
parent 15da3e4d53 a58571a475
commit a4eb3df5f0
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -53,4 +53,5 @@ Makefile.gcc-orig
# VS 2017 caches data into the hidden directory .vs # VS 2017 caches data into the hidden directory .vs
.vs .vs
# Win32-specific ignores end # Win32-specific ignores end
.DS_Store
doc/fixes36.2
+2
View File
@@ -200,6 +200,8 @@ nurse corpse/tin chance to convey poison resistance when eaten was not honored
make tame vampires be more aggressive when shifted to bat/fog/wolf form make tame vampires be more aggressive when shifted to bat/fog/wolf form
a stale gold symbol could be displayed on the status line following a switch a stale gold symbol could be displayed on the status line following a switch
to a new symset, as observed and reported for Windows RogueEpyx symset to a new symset, as observed and reported for Windows RogueEpyx symset
successfully paying for shop damage with shop credit would be followed by
impossible "zero payment in money2mon"
Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository
src/shk.c
+8 -4
View File
@@ -1827,9 +1827,10 @@ int croaked;
eshkp->robbed -= umoney; eshkp->robbed -= umoney;
if (eshkp->robbed < 0L) if (eshkp->robbed < 0L)
eshkp->robbed = 0L; eshkp->robbed = 0L;
if (umoney > 0) if (umoney > 0L) {
money2mon(shkp, umoney); money2mon(shkp, umoney);
context.botl = 1; context.botl = 1;
}
pline("%s %s all your possessions.", Shknam(shkp), takes); pline("%s %s all your possessions.", Shknam(shkp), takes);
taken = TRUE; taken = TRUE;
/* where to put player's invent (after disclosure) */ /* where to put player's invent (after disclosure) */
@@ -2795,6 +2796,7 @@ boolean peaceful, silent;
if (peaceful) { if (peaceful) {
boolean credit_use = !!ESHK(shkp)->credit; boolean credit_use = !!ESHK(shkp)->credit;
value = check_credit(value, shkp); value = check_credit(value, shkp);
/* 'peaceful' affects general treatment, but doesn't affect /* 'peaceful' affects general treatment, but doesn't affect
* the fact that other code expects that all charges after the * the fact that other code expects that all charges after the
@@ -4027,8 +4029,10 @@ boolean cant_mollify;
currency(cost_of_damage), !animal ? "\"" : ""); currency(cost_of_damage), !animal ? "\"" : "");
if (yn(qbuf) != 'n') { if (yn(qbuf) != 'n') {
cost_of_damage = check_credit(cost_of_damage, shkp); cost_of_damage = check_credit(cost_of_damage, shkp);
money2mon(shkp, cost_of_damage); if (cost_of_damage > 0L) {
context.botl = 1; money2mon(shkp, cost_of_damage);
context.botl = 1;
}
pline("Mollified, %s accepts your restitution.", shkname(shkp)); pline("Mollified, %s accepts your restitution.", shkname(shkp));
/* move shk back to his home loc */ /* move shk back to his home loc */
home_shk(shkp, FALSE); home_shk(shkp, FALSE);