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

U1182 - Can drink from sink while engulfed

Browse Source 
The same occurred for fountains and drinking surrounding water while
underwater.
I also added a !Levitation check for sinks, like already exists for
fountains.  I cannot believe sinks are taller than an altar, and if you
can't pick up stuff from an alter while levitation, it stands to reason you
cannot drink from a sink then either.
This commit is contained in:
cohrs
2004-11-29 19:01:31 +00:00
parent 384628da9a
commit 2abfb12144
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.4
+1
View File
@@ -68,6 +68,7 @@ breaking container contents in a shop didn't always charge for them
some types of shop theft of a stack of items only charged for a single one some types of shop theft of a stack of items only charged for a single one
wizard mode: WIZKIT wish for own quest artifact triggered crash at startup wizard mode: WIZKIT wish for own quest artifact triggered crash at startup
avoid "your steed is still eating" message when going through a magic portal avoid "your steed is still eating" message when going through a magic portal
cannot drink from fountain, sink or surrounding water while swallowed
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/potion.c
+3 -3
View File
@@ -342,7 +342,7 @@ dodrink()
return 0; return 0;
} }
/* Is there a fountain to drink from here? */ /* Is there a fountain to drink from here? */
if (IS_FOUNTAIN(levl[u.ux][u.uy].typ) && !Levitation) { if (IS_FOUNTAIN(levl[u.ux][u.uy].typ) && !Levitation && !u.uswallow) {
if(yn("Drink from the fountain?") == 'y') { if(yn("Drink from the fountain?") == 'y') {
drinkfountain(); drinkfountain();
return 1; return 1;
@@ -350,7 +350,7 @@ dodrink()
} }
#ifdef SINKS #ifdef SINKS
/* Or a kitchen sink? */ /* Or a kitchen sink? */
if (IS_SINK(levl[u.ux][u.uy].typ)) { if (IS_SINK(levl[u.ux][u.uy].typ) && !Levitation && !u.uswallow) {
if (yn("Drink from the sink?") == 'y') { if (yn("Drink from the sink?") == 'y') {
drinksink(); drinksink();
return 1; return 1;
@@ -359,7 +359,7 @@ dodrink()
#endif #endif
/* Or are you surrounded by water? */ /* Or are you surrounded by water? */
if (Underwater) { if (Underwater && !u.uswallow) {
if (yn("Drink the water around you?") == 'y') { if (yn("Drink the water around you?") == 'y') {
pline("Do you know what lives in this water!"); pline("Do you know what lives in this water!");
return 1; return 1;