From d0c6b407b47daaee8ded5fc7bf56a7b41c526d63 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 3 Dec 2015 15:16:50 +0100
Subject: [PATCH] Fix isUnderwater checks being off by one for exterior cells

---
 apps/openmw/mwworld/cellstore.cpp | 2 ++
 apps/openmw/mwworld/scene.cpp     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index e9f9c5cd1..5832a6727 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -296,6 +296,8 @@ namespace MWWorld
 
     float CellStore::getWaterLevel() const
     {
+        if (isExterior())
+            return -1;
         return mWaterLevel;
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index c6b50aae3..45c94b6d9 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -265,7 +265,7 @@ namespace MWWorld
 
             mRendering.addCell(cell);
             bool waterEnabled = cell->getCell()->hasWater() || cell->isExterior();
-            float waterLevel = cell->isExterior() ? -1.f : cell->getWaterLevel();
+            float waterLevel = cell->getWaterLevel();
             mRendering.setWaterEnabled(waterEnabled);
             if (waterEnabled)
             {