From d02e075bab885d805e8c6d7b994da75c69f69154 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 6 Jan 2015 23:54:53 +0100
Subject: [PATCH] Add setting for exterior cell grid size (Fixes #1537)

---
 apps/openmw/mwworld/scene.cpp | 16 +++++++++-------
 files/settings-default.cfg    |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 02c9db9ea..efe88c406 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -296,15 +296,17 @@ namespace MWWorld
         std::string loadingExteriorText = "#{sLoadingMessage3}";
         loadingListener->setLabel(loadingExteriorText);
 
+        const int halfGridSize = Settings::Manager::getInt("exterior grid size", "Cells")/2;
+
         CellStoreCollection::iterator active = mActiveCells.begin();
         while (active!=mActiveCells.end())
         {
             if ((*active)->getCell()->isExterior())
             {
-                if (std::abs (X-(*active)->getCell()->getGridX())<=1 &&
-                    std::abs (Y-(*active)->getCell()->getGridY())<=1)
+                if (std::abs (X-(*active)->getCell()->getGridX())<=halfGridSize &&
+                    std::abs (Y-(*active)->getCell()->getGridY())<=halfGridSize)
                 {
-                    // keep cells within the new 3x3 grid
+                    // keep cells within the new grid
                     ++active;
                     continue;
                 }
@@ -314,9 +316,9 @@ namespace MWWorld
 
         int refsToLoad = 0;
         // get the number of refs to load
-        for (int x=X-1; x<=X+1; ++x)
+        for (int x=X-halfGridSize; x<=X+halfGridSize; ++x)
         {
-            for (int y=Y-1; y<=Y+1; ++y)
+            for (int y=Y-halfGridSize; y<=Y+halfGridSize; ++y)
             {
                 CellStoreCollection::iterator iter = mActiveCells.begin();
 
@@ -339,9 +341,9 @@ namespace MWWorld
         loadingListener->setProgressRange(refsToLoad);
 
         // Load cells
-        for (int x=X-1; x<=X+1; ++x)
+        for (int x=X-halfGridSize; x<=X+halfGridSize; ++x)
         {
-            for (int y=Y-1; y<=Y+1; ++y)
+            for (int y=Y-halfGridSize; y<=Y+halfGridSize; ++y)
             {
                 CellStoreCollection::iterator iter = mActiveCells.begin();
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 6ec9b03e9..f91299a1f 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -123,6 +123,9 @@ local map resolution = 256
 local map widget size = 512
 local map hud widget size = 256
 
+[Cells]
+exterior grid size = 3
+
 [Viewing distance]
 # Limit the rendering distance of small objects
 limit small object distance = false