From ae77e7b0d84a0fa92e9a13f558d6ca0bf901efe0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 17 May 2012 18:11:34 +0200
Subject: [PATCH] don't try to retrieve land data from non-predefined cells.

---
 apps/openmw/mwworld/scene.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index caaef5264..e4236b2f7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -82,7 +82,11 @@ namespace MWWorld
             }
 
             if (!((*iter)->cell->data.flags & ESM::Cell::Interior))
-                mPhysics->removeHeightField( (*iter)->cell->data.gridX, (*iter)->cell->data.gridY );
+            {
+                ESM::Land* land = mWorld->getStore().lands.search((*iter)->cell->data.gridX,(*iter)->cell->data.gridY);
+                if (land)
+                    mPhysics->removeHeightField( (*iter)->cell->data.gridX, (*iter)->cell->data.gridY );
+            }
         }
 
 		mRendering.removeCell(*iter);
@@ -118,9 +122,10 @@ namespace MWWorld
             if (!(cell->cell->data.flags & ESM::Cell::Interior))
             {
                 ESM::Land* land = mWorld->getStore().lands.search(cell->cell->data.gridX,cell->cell->data.gridY);
-                mPhysics->addHeightField (land->landData->heights,
-                    cell->cell->data.gridX, cell->cell->data.gridY,
-                    0, ( worldsize/(verts-1) ), verts);
+                if (land)
+                    mPhysics->addHeightField (land->landData->heights,
+                        cell->cell->data.gridX, cell->cell->data.gridY,
+                        0, ( worldsize/(verts-1) ), verts);
             }
 
             mRendering.configureAmbient(*cell);