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

setmnotwielded should always MON_NOWEP

Browse Source 
Instead of making the caller remember to use MON_NOWEP, make
setmnotwielded handle that automatically.  This fixes the
"bad monster weapon restore" errors I've been seeing.

Also adds sanity checks for this.
This commit is contained in:
Pasi Kallinen
2015-10-06 18:47:52 +03:00
parent a51531776d
commit 8212ddd69e
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mkobj.c
View File

@@ -2156,9 +2156,16 @@ struct monst *monlist;
const char *mesg;
{
struct monst *mon;
struct obj *obj;
struct obj *obj, *mwep;
for (mon = monlist; mon; mon = mon->nmon)
for (mon = monlist; mon; mon = mon->nmon) {
mwep = MON_WEP(mon);
if (mwep) {
if (!mcarried(mwep))
insane_object(mwep, mfmt1, mesg, mon);
if (mwep->ocarry != mon)
insane_object(mwep, mfmt2, mesg, mon);
}
for (obj = mon->minvent; obj; obj = obj->nobj) {
if (obj->where != OBJ_MINVENT)
insane_object(obj, mfmt1, mesg, mon);
@@ -2166,6 +2173,7 @@ const char *mesg;
insane_object(obj, mfmt2, mesg, mon);
check_contained(obj, mesg);
}
}
}
/* This must stay consistent with the defines in obj.h. */