nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix cursed scroll of light on the rogue level

Browse Source 
Being blind and engulfed, reading cursed scroll of light did still darken
the room on the Rogue level.  This also changes the logic a bit, so that
cursed scroll of light will douse lamps in your inventory, even when
swallowed.
This commit is contained in:
Pasi Kallinen
2015-10-09 08:00:43 +03:00
parent a28b535e80
commit e995d88997
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/read.c
View File

@@ -1816,13 +1816,13 @@ struct obj *obj;
if (!Blind) {
if (u.uswallow) {
pline("It seems even darker in here than before.");
return;
} else {
if (uwep && artifact_light(uwep) && uwep->lamplit)
pline("Suddenly, the only light left comes from %s!",
the(xname(uwep)));
else
You("are surrounded by darkness!");
}
if (uwep && artifact_light(uwep) && uwep->lamplit)
pline("Suddenly, the only light left comes from %s!",
the(xname(uwep)));
else
You("are surrounded by darkness!");
}
/* the magic douses lamps, et al, too */
@@ -1840,14 +1840,12 @@ struct obj *obj;
pline("%s shines briefly.", Monnam(u.ustuck));
else
pline("%s glistens.", Monnam(u.ustuck));
return;
}
if (!Blind)
} else if (!Blind)
pline("A lit field surrounds you!");
}
/* No-op in water - can only see the adjacent squares and that's it! */
if (Underwater || Is_waterlevel(&u.uz))
/* No-op when swallowed or in water */
if (u.uswallow || Underwater || Is_waterlevel(&u.uz))
return;
/*
* If we are darkening the room and the hero is punished but not