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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2019-02-01 19:23:44 -05:00
parent 7f0eabbcd2 9f1ae0fe74
commit 8cb9d45ab6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pager.c
+2 -2
View File
@@ -187,14 +187,14 @@ struct obj **obj_p;
otmp->quan = 2L; /* to force pluralization */ otmp->quan = 2L; /* to force pluralization */
else if (otmp->otyp == SLIME_MOLD) else if (otmp->otyp == SLIME_MOLD)
otmp->spe = context.current_fruit; /* give it a type */ otmp->spe = context.current_fruit; /* give it a type */
else if (otmp->otyp == LEASH)
otmp->leashmon = 0;
if (mtmp && has_mcorpsenm(mtmp)) /* mimic as corpse/statue */ if (mtmp && has_mcorpsenm(mtmp)) /* mimic as corpse/statue */
otmp->corpsenm = MCORPSENM(mtmp); otmp->corpsenm = MCORPSENM(mtmp);
else if (otmp->otyp == CORPSE && glyph_is_body(glyph)) else if (otmp->otyp == CORPSE && glyph_is_body(glyph))
otmp->corpsenm = glyph - GLYPH_BODY_OFF; otmp->corpsenm = glyph - GLYPH_BODY_OFF;
else if (otmp->otyp == STATUE && glyph_is_statue(glyph)) else if (otmp->otyp == STATUE && glyph_is_statue(glyph))
otmp->corpsenm = glyph - GLYPH_STATUE_OFF; otmp->corpsenm = glyph - GLYPH_STATUE_OFF;
if (otmp->otyp == LEASH)
otmp->leashmon = 0;
} }
/* if located at adjacent spot, mark it as having been seen up close /* if located at adjacent spot, mark it as having been seen up close
(corpse type will be known even if dknown is 0, so we don't need a (corpse type will be known even if dknown is 0, so we don't need a
src/pray.c
+1 -1
View File
@@ -157,7 +157,7 @@ stuck_in_wall()
y = u.uy + j; y = u.uy + j;
if (!isok(x, y) if (!isok(x, y)
|| (IS_ROCK(levl[x][y].typ) || (IS_ROCK(levl[x][y].typ)
&& (levl[x][y].typ != SDOOR || levl[x][y].typ != SCORR)) && (levl[x][y].typ != SDOOR && levl[x][y].typ != SCORR))
|| (blocked_boulder(i, j) && !throws_rocks(youmonst.data))) || (blocked_boulder(i, j) && !throws_rocks(youmonst.data)))
++count; ++count;
} }