tripping over objects under water

- cannot trip over submerged objects when you're water walking

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 8a589aab9d4c6d000dd1aee89d216a01333e507b..3d6150a1cf2dafd1a4ee71cf35c9ae2c6099d20e 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -42,6 +42,7 @@ animal_parts are not always appropriate for ravens
 prevent panic if tombstone window cannot be created
 clarify travel command behavior in the Guidebook
 touch_artifact checks needed when snagging w/bullwhip and stealing
+cannot trip over submerged objects if you're water walking
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/timeout.c b/src/timeout.c
index 9a68ed879fe8137014175c301146f3c0dc8bdbca..0f0dcbbee774d2cc5ec8b438da9aa76b9b6c9d81 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -621,6 +621,8 @@ slip_or_trip()
        if (u.usteed) on_foot = FALSE;
 #endif
 
+       if (otmp && on_foot && !u.uinwater && is_pool(u.ux, u.uy)) otmp = 0;
+
        if (otmp && on_foot) {          /* trip over something in particular */
            /*
                If there is only one item, it will have just been named