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

Fix trying to look up curse state of deleted object

Browse Source
This commit is contained in:
Pasi Kallinen
2015-10-30 20:54:45 +02:00
parent e6ed35b8f7
commit 4aac554b66
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/muse.c
View File

@@ -1425,6 +1425,7 @@ struct monst *mtmp;
/* don't use monster fields after killing it */
boolean confused = (mtmp->mconf ? TRUE : FALSE);
int mmx = mtmp->mx, mmy = mtmp->my;
boolean is_cursed = otmp->cursed;
mreadmsg(mtmp, otmp);
/* Identify the scroll */
@@ -1457,8 +1458,8 @@ struct monst *mtmp;
}
m_useup(mtmp, otmp);
/* Attack the player */
if (distmin(mmx, mmy, u.ux, u.uy) == 1 && !otmp->cursed) {
drop_boulder_on_player(confused, !otmp->cursed, FALSE, TRUE);
if (distmin(mmx, mmy, u.ux, u.uy) == 1 && !is_cursed) {
drop_boulder_on_player(confused, !is_cursed, FALSE, TRUE);
}
return (mtmp->mhp <= 0) ? 1 : 2;