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

Fix enexto complaint when morguemon returned null

Browse Source
This commit is contained in:
Pasi Kallinen
2015-11-14 09:59:35 +02:00
parent 95772261dc
commit 739b6708ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mkroom.c
View File

@@ -422,7 +422,7 @@ int mm_flags;
while (cnt--) { while (cnt--) {
mdat = morguemon(); mdat = morguemon();
if (enexto(&cc, mm->x, mm->y, mdat) if (mdat && enexto(&cc, mm->x, mm->y, mdat)
&& (!revive_corpses && (!revive_corpses
|| !(otmp = sobj_at(CORPSE, cc.x, cc.y)) || !(otmp = sobj_at(CORPSE, cc.x, cc.y))
|| !revive(otmp, FALSE))) || !revive(otmp, FALSE)))

2
src/polyself.c
View File

@@ -448,7 +448,7 @@ int psflags;
|| mntmp == urole.femalenum)) { || mntmp == urole.femalenum)) {
const char *pm_name; const char *pm_name;
/* mkclass_ploy() can pick a !polyok() /* mkclass_poly() can pick a !polyok()
candidate; if so, usually try again */ candidate; if so, usually try again */
if (class) { if (class) {
if (rn2(3) || --tryct > 0) if (rn2(3) || --tryct > 0)