Clean up ceiling nits.

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

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
certain exceptions)
uncursed enchant weapon now correctly fixes erosion
scroll of earth messages cleaned up
Platform- and/or Interface-Specific Fixes

View File

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

View File

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