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

Merge branch 'master' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2019-06-24 19:47:22 -04:00
parent f6ef689778 47c5a14ff4
commit e34c7daf02
5 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/restore.c
View File

@@ -643,7 +643,8 @@ unsigned int *stuckid, *steedid;
struct sysflag newgamesysflags;
#endif
struct context_info newgamecontext; /* all 0, but has some pointers */
struct obj *otmp, *tmp_bc;
struct obj *otmp;
struct obj *bc_obj;
char timebuf[15];
unsigned long uid;
boolean defer_perm_invent;
@@ -782,17 +783,15 @@ unsigned int *stuckid, *steedid;
if (nhfp->fieldlevel && nhfp->addinfo)
sfi_addinfo(nhfp, "objchain", "start", "invent", 0);
g.invent = restobjchn(nhfp, FALSE, FALSE);
/* tmp_bc only gets set here if the ball & chain were orphaned
because you were swallowed; otherwise they will be on the floor
or in your inventory */
tmp_bc = restobjchn(nhfp, FALSE, FALSE);
if (tmp_bc) {
for (otmp = tmp_bc; otmp; otmp = otmp->nobj) {
if (otmp->owornmask)
setworn(otmp, otmp->owornmask);
}
if (!uball || !uchain)
impossible("restgamestate: lost ball & chain");
/* restore dangling (not on floor or in inventory) ball and/or chain */
bc_obj = restobjchn(nhfp, FALSE, FALSE);
while(bc_obj) {
struct obj * nobj = bc_obj->nobj;
if (bc_obj->owornmask)
setworn(bc_obj, bc_obj->owornmask);
bc_obj->nobj = (struct obj *)0;
bc_obj = nobj;
}
g.migrating_objs = restobjchn(nhfp, FALSE, FALSE);
g.migrating_mons = restmonchn(nhfp, FALSE);
@@ -818,6 +817,10 @@ unsigned int *stuckid, *steedid;
for (otmp = g.invent; otmp; otmp = otmp->nobj)
if (otmp->owornmask)
setworn(otmp, otmp->owornmask);
if ((uball && !uchain) || (uchain && !uball))
impossible("restgamestate: lost ball & chain");
/* reset weapon so that player will get a reminder about "bashing"
during next fight when bare-handed or wielding an unconventional
item; for pick-axe, we aren't able to distinguish between having