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

Prevent segfault in can_blnd

Browse Source
This commit is contained in:
Pasi Kallinen
2020-02-16 11:22:18 +02:00
parent f9c9c8262c
commit f76aba4d7f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mondata.c
View File

@@ -182,7 +182,9 @@ struct monst *mon;
} }
/* True iff monster can be blinded by the given attack; /* True iff monster can be blinded by the given attack;
note: may return True when mdef is blind (e.g. new cream-pie attack) */ note: may return True when mdef is blind (e.g. new cream-pie attack)
magr can be NULL.
*/
boolean boolean
can_blnd(magr, mdef, aatyp, obj) can_blnd(magr, mdef, aatyp, obj)
struct monst *magr; /* NULL == no specific aggressor */ struct monst *magr; /* NULL == no specific aggressor */
@@ -203,7 +205,7 @@ struct obj *obj; /* aatyp == AT_WEAP, AT_SPIT */
a saying expressed in Latin rather than a zoological observation: a saying expressed in Latin rather than a zoological observation:
"a crow will not pluck out the eye of another crow" "a crow will not pluck out the eye of another crow"
so prevent ravens from blinding each other */ so prevent ravens from blinding each other */
if (magr->data == &mons[PM_RAVEN] && mdef->data == &mons[PM_RAVEN]) if (magr && magr->data == &mons[PM_RAVEN] && mdef->data == &mons[PM_RAVEN])
return FALSE; return FALSE;
switch (aatyp) { switch (aatyp) {