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

Merge branch 'argrath' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2022-02-09 16:09:37 -05:00
parent a0771c770b a1b14b6b5c
commit 478daa0002
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/eat.c
View File

@@ -1256,30 +1256,32 @@ void
tin_details(struct obj *obj, int mnum, char *buf)
{
char buf2[BUFSZ];
if (!obj || !buf)
return;
int r = tin_variety(obj, TRUE);
if (obj && buf) {
if (r == SPINACH_TIN)
Strcat(buf, " of spinach");
else if (mnum == NON_PM)
Strcpy(buf, "empty tin");
else {
if ((obj->cknown || iflags.override_ID) && obj->spe < 0) {
if (r == ROTTEN_TIN || r == HOMEMADE_TIN) {
/* put these before the word tin */
Sprintf(buf2, "%s %s of ", tintxts[r].txt, buf);
Strcpy(buf, buf2);
} else {
Sprintf(eos(buf), " of %s ", tintxts[r].txt);
}
if (r == SPINACH_TIN)
Strcat(buf, " of spinach");
else if (mnum == NON_PM)
Strcpy(buf, "empty tin");
else {
if ((obj->cknown || iflags.override_ID) && obj->spe < 0) {
if (r == ROTTEN_TIN || r == HOMEMADE_TIN) {
/* put these before the word tin */
Sprintf(buf2, "%s %s of ", tintxts[r].txt, buf);
Strcpy(buf, buf2);
} else {
Strcpy(eos(buf), " of ");
Sprintf(eos(buf), " of %s ", tintxts[r].txt);
}
if (vegetarian(&mons[mnum]))
Sprintf(eos(buf), "%s", mons[mnum].pmnames[NEUTRAL]);
else
Sprintf(eos(buf), "%s meat", mons[mnum].pmnames[NEUTRAL]);
} else {
Strcpy(eos(buf), " of ");
}
if (vegetarian(&mons[mnum]))
Sprintf(eos(buf), "%s", mons[mnum].pmnames[NEUTRAL]);
else
Sprintf(eos(buf), "%s meat", mons[mnum].pmnames[NEUTRAL]);
}
}

5
src/save.c
View File

@@ -457,6 +457,9 @@ savelev(NHFILE* nhfp, xchar lev)
#endif
g.program_state.saving++; /* even if current mode is FREEING */
if (!nhfp)
panic("Save on bad file!"); /* impossible */
/*
* Level file contents:
* version info (handled by caller);
@@ -483,8 +486,6 @@ savelev(NHFILE* nhfp, xchar lev)
if (iflags.purge_monsters)
dmonsfree();
if (!nhfp)
panic("Save on bad file!"); /* impossible */
if (lev >= 0 && lev <= maxledgerno())
g.level_info[lev].flags |= VISITED;
if (nhfp->structlevel)