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
This commit is contained in:
PatR
2021-04-17 17:36:14 -07:00
parent c79e7601a0
commit a70927b95f
2 changed files with 3 additions and 1 deletions
+2
View File
@@ -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 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, unless the container is cursed, same as for oilskin sacks (previously,
chests+large boxes were always immune and ice boxes always vulnerable) 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 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
+1 -1
View File
@@ -1452,7 +1452,7 @@ use_lamp(struct obj *obj)
if ((!Is_candle(obj) && obj->age == 0) if ((!Is_candle(obj) && obj->age == 0)
|| (obj->otyp == MAGIC_LAMP && obj->spe == 0)) { || (obj->otyp == MAGIC_LAMP && obj->spe == 0)) {
if (obj->otyp == BRASS_LANTERN) if (obj->otyp == BRASS_LANTERN)
Your("lamp has run out of power."); Your("lantern is out of power.");
else else
pline("This %s has no oil.", xname(obj)); pline("This %s has no oil.", xname(obj));
return; return;