From 0db82f02cfb7bdd555a2a45d605bb7af600163a0 Mon Sep 17 00:00:00 2001
From: Edward Richardson <Edward850@crantime.org>
Date: Wed, 12 Feb 2014 20:30:37 +1300
Subject: [PATCH] P_HitWater ignore extra floors below real floor

P_HitWater incorrectly assumed extra floors were always above the real
floor.
---
 src/p_mobj.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index d97a091ea..7dc8a3f46 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -5169,7 +5169,7 @@ bool P_HitWater (AActor * thing, sector_t * sec, fixed_t x, fixed_t y, fixed_t z
 			}
 		}
 		planez = rover->bottom.plane->ZatPoint(x, y);
-		if (planez < z) return false;
+		if (planez < z && !(planez < thing->floorz)) return false;
 	}
 #endif
 	hsec = sec->GetHeightSec();