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

Need to check ball and chain after we have procesed floor objects.

Browse Source
This commit is contained in:
Bart House
2019-06-30 16:34:41 -07:00
parent e35a216e51
commit c928cda775
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/restore.c
+7 -7
View File
@@ -672,13 +672,6 @@ unsigned int *stuckid, *steedid;
if (otmp->owornmask) if (otmp->owornmask)
setworn(otmp, otmp->owornmask); setworn(otmp, otmp->owornmask);
if ((uball && !uchain) || (uchain && !uball)) {
impossible("restgamestate: lost ball & chain");
/* poor man's unpunish() */
setworn((struct obj *) 0, W_CHAIN);
setworn((struct obj *) 0, W_BALL);
}
/* reset weapon so that player will get a reminder about "bashing" /* reset weapon so that player will get a reminder about "bashing"
during next fight when bare-handed or wielding an unconventional during next fight when bare-handed or wielding an unconventional
item; for pick-axe, we aren't able to distinguish between having item; for pick-axe, we aren't able to distinguish between having
@@ -921,6 +914,13 @@ register int fd;
if (otmp->owornmask) if (otmp->owornmask)
setworn(otmp, otmp->owornmask); setworn(otmp, otmp->owornmask);
if ((uball && !uchain) || (uchain && !uball)) {
impossible("restgamestate: lost ball & chain");
/* poor man's unpunish() */
setworn((struct obj *) 0, W_CHAIN);
setworn((struct obj *) 0, W_BALL);
}
/* in_use processing must be after: /* in_use processing must be after:
* + The inventory has been read so that freeinv() works. * + The inventory has been read so that freeinv() works.
* + The current level has been restored so billing information * + The current level has been restored so billing information