Clean up ceiling nits.

Fixes C343-102.

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index cb91c952632db727e6fb707178c6f2522ae7941a..f3086b3fd3a6da0453c95e9480c2c5a8db7851ac 100644 (file)
--- 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 a26c775a5523482aadcdcf93ddf28d34b6001c3b..4da6f66a3b4c8a5c179780e7b29dc53a0670b41c 100644 (file)
--- 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 39de2c13d72c29d0144f225b6c5465578e94474c..33ca4fe793d9c8793ffc136051665507c127be1f 100644 (file)
--- 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();