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.
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
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
return 0;
}
/* 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') {
drinkfountain();
return 1;
}
#ifdef SINKS
/* 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') {
drinksink();
return 1;
#endif
/* Or are you surrounded by water? */
- if (Underwater) {
+ if (Underwater && !u.uswallow) {
if (yn("Drink the water around you?") == 'y') {
pline("Do you know what lives in this water!");
return 1;