From 62519872b982428e7c968f0b0c587ea63e09002a Mon Sep 17 00:00:00 2001
From: cohrs <cohrs>
Date: Mon, 1 Apr 2002 00:57:22 +0000
Subject: [PATCH] tripping over objects under water - cannot trip over
 submerged objects when you're water walking

---
 doc/fixes34.1 | 1 +
 src/timeout.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 8a589aab9..3d6150a1c 100644
--- 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 9a68ed879..0f0dcbbee 100644
--- 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