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

mention_decor vs Underwater or drowning escape

Browse Source 
Avoid redundant
|You are on solid land again.
|You are back on floor.
when walking or teleporting out of water with the mention_decor option on.
This commit is contained in:
PatR
2020-04-03 10:41:30 -07:00
parent 42fc34691d
commit b37b9f25ce
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hack.c
View File

@@ -2106,13 +2106,15 @@ boolean newspot; /* true if called by spoteffects */
boolean still_inwater = FALSE; /* assume we're getting out */
if (!is_pool(u.ux, u.uy)) {
if (Is_waterlevel(&u.uz))
if (Is_waterlevel(&u.uz)) {
You("pop into an air bubble.");
else if (is_lava(u.ux, u.uy))
} else if (is_lava(u.ux, u.uy)) {
You("leave the %s...", hliquid("water")); /* oops! */
else
} else {
You("are on solid %s again.",
is_ice(u.ux, u.uy) ? "ice" : "land");
iflags.last_msg = PLNMSG_BACK_ON_GROUND;
}
} else if (Is_waterlevel(&u.uz)) {
still_inwater = TRUE;
} else if (Levitation) {