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

Clean up ceiling nits.

Browse Source 
Fixes C343-102.
This commit is contained in:
Sean Hunt
2015-05-25 00:04:03 +09:00
committed by nhmall
parent 77eb56b7b6
commit 4cd43fdaa2
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes35.0
View File

@@ -914,6 +914,7 @@ scare monster scroll now provides a better effect
monsters without hands can no longer pick up piles of objects (with monsters without hands can no longer pick up piles of objects (with
certain exceptions) certain exceptions)
uncursed enchant weapon now correctly fixes erosion uncursed enchant weapon now correctly fixes erosion
scroll of earth messages cleaned up
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

2
src/engrave.c
View File

@@ -233,7 +233,7 @@ register int x, y;
|| IS_DOOR(lev->typ) || lev->typ == SDOOR) || IS_DOOR(lev->typ) || lev->typ == SDOOR)
what = "ceiling"; what = "ceiling";
else else
what = "rock above"; what = "rock cavern";
return what; return what;
} }

9
src/read.c
View File

@@ -1532,14 +1532,17 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
break; break;
case SCR_EARTH: case SCR_EARTH:
/* TODO: handle steeds */ /* TODO: handle steeds */
if (!Is_rogue_level(&u.uz) if (!Is_rogue_level(&u.uz) && has_ceiling(&u.uz)
&& (!In_endgame(&u.uz) || Is_earthlevel(&u.uz))) { && (!In_endgame(&u.uz) || Is_earthlevel(&u.uz))) {
register int x, y; register int x, y;
int nboulders = 0; int nboulders = 0;
/* Identify the scroll */ /* Identify the scroll */
pline_The("%s rumbles %s you!", ceiling(u.ux, u.uy), if (u.uswallow)
sblessed ? "around" : "above"); You_hear("rumbling.");
else
pline_The("%s rumbles %s you!", ceiling(u.ux, u.uy),
sblessed ? "around" : "above");
known = 1; known = 1;
sokoban_guilt(); sokoban_guilt();