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

Chatting with priest converted to minion crashes the game (few code paths in priest_talk() assumed the priest has an altar)

Browse Source
This commit is contained in:
Alex Kompel
2015-06-06 08:16:30 -07:00
parent 4453ecac64
commit 6d8a591fc1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/priest.c
+4 -3
View File
@@ -150,7 +150,8 @@ histemple_at(priest, x, y)
register struct monst *priest; register struct monst *priest;
register xchar x, y; register xchar x, y;
{ {
return ((boolean)((EPRI(priest)->shroom == *in_rooms(x, y, TEMPLE)) return ((boolean)(priest && priest->ispriest
&& (EPRI(priest)->shroom == *in_rooms(x, y, TEMPLE))
&& on_level(&(EPRI(priest)->shrlevel), &u.uz))); && on_level(&(EPRI(priest)->shrlevel), &u.uz)));
} }
@@ -342,7 +343,7 @@ boolean
p_coaligned(priest) p_coaligned(priest)
struct monst *priest; struct monst *priest;
{ {
return ((boolean)(u.ualign.type == ((int) EPRI(priest)->shralign))); return ((boolean)(u.ualign.type == mon_aligntyp(priest)));
} }
STATIC_OVL boolean STATIC_OVL boolean
@@ -542,7 +543,7 @@ register struct monst *priest;
} }
/* priests don't chat unless peaceful and in their own temple */ /* priests don't chat unless peaceful and in their own temple */
if (!histemple_at(priest, priest->mx, priest->my) || !priest->mpeaceful if (!inhistemple(priest) || !priest->mpeaceful
|| !priest->mcanmove || priest->msleeping) { || !priest->mcanmove || priest->msleeping) {
static const char *cranky_msg[3] = { static const char *cranky_msg[3] = {
"Thou wouldst have words, eh? I'll give thee a word or two!", "Thou wouldst have words, eh? I'll give thee a word or two!",