From 4cd43fdaa2d7579b7820e1fbeb9f63b4186113ac Mon Sep 17 00:00:00 2001 From: Sean Hunt Date: Mon, 25 May 2015 00:04:03 +0900 Subject: [PATCH] Clean up ceiling nits. Fixes C343-102. --- doc/fixes35.0 | 1 + src/engrave.c | 2 +- src/read.c | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/fixes35.0 b/doc/fixes35.0 index cb91c9526..f3086b3fd 100644 --- a/doc/fixes35.0 +++ b/doc/fixes35.0 @@ -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 diff --git a/src/engrave.c b/src/engrave.c index a26c775a5..4da6f66a3 100644 --- a/src/engrave.c +++ b/src/engrave.c @@ -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; } diff --git a/src/read.c b/src/read.c index 39de2c13d..33ca4fe79 100644 --- a/src/read.c +++ b/src/read.c @@ -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(); -- 2.50.1