fix pull request #489 - applying an empty lantern

The message given when attempting to light a lantern with no power
left described it as a lamp.  Change that to lantern.  Also, "has
run out of power" duplicates the message given when it burns out;
change that part to "is out of power".

Your lamp has run out of power.  ->  Your lantern is out of power.

Fixes #489

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index bb5c3e4cd2b9ffe1ad20155297e47a64b4f341e2..8cbba5056b4b94d9ff2cbe66486bf87b0a2569e7 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -463,6 +463,8 @@ allow 'scores:none' as shorthand for 'scores:0 t/0 a/!o' (player will be told
 contents of chests, large boxes, and ice boxes are now immune to water damage
        unless the container is cursed, same as for oilskin sacks (previously,
        chests+large boxes were always immune and ice boxes always vulnerable)
+applying an empty brass lantern in an attempt to light it reported "your lamp
+       has run out of power"; change to "your lantern is out of power"
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --git a/src/apply.c b/src/apply.c
index 7d27cd92102228ae7d428fa45b31a92d0a37143a..868871e049841483dcbc3bb6c9ab3e7a4c12c976 100644 (file)
--- a/src/apply.c
+++ b/src/apply.c
@@ -1452,7 +1452,7 @@ use_lamp(struct obj *obj)
     if ((!Is_candle(obj) && obj->age == 0)
         || (obj->otyp == MAGIC_LAMP && obj->spe == 0)) {
         if (obj->otyp == BRASS_LANTERN)
-            Your("lamp has run out of power.");
+            Your("lantern is out of power.");
         else
             pline("This %s has no oil.", xname(obj));
         return;