From 72cb405de220d5cfe706c5c1c0e57358c32ab2dc Mon Sep 17 00:00:00 2001
From: Kyle Cooley <kyleacooley@gmail.com>
Date: Fri, 8 Sep 2017 21:03:52 -0400
Subject: [PATCH] Some bug fixes, changes to land load code.

---
 apps/opencs/model/world/columnimp.cpp    |  6 ++++--
 apps/opencs/model/world/data.cpp         | 14 +-------------
 apps/opencs/model/world/idcollection.hpp | 17 +++++++++++++++++
 components/esm/loadland.cpp              |  4 ++--
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/apps/opencs/model/world/columnimp.cpp b/apps/opencs/model/world/columnimp.cpp
index 65d2fecd2..e6b406864 100644
--- a/apps/opencs/model/world/columnimp.cpp
+++ b/apps/opencs/model/world/columnimp.cpp
@@ -103,7 +103,8 @@ namespace CSMWorld
 
         assert (array.count() == Land::LAND_NUM_VERTS * sizeof(float));
 
-        for (int i = 0; i < array.count(); ++i)
+        int count = array.count() / sizeof(float);
+        for (int i = 0; i < count; ++i)
         {
             landData->mHeights[i] = rawData[i];
         }
@@ -183,7 +184,8 @@ namespace CSMWorld
 
         assert (array.count() == Land::LAND_NUM_TEXTURES * sizeof(uint16_t));
 
-        for (int i = 0; i < array.count(); ++i)
+        int count = array.count() / sizeof(uint16_t);
+        for (int i = 0; i < count; ++i)
         {
             landData->mTextures[i] = rawData[i];
         }
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 3284d9b05..0ffe5fa21 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -1013,19 +1013,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
 
         case ESM::REC_LTEX: mLandTextures.load (*mReader, mBase); break;
 
-        case ESM::REC_LAND:
-        {
-            int index = mLand.load(*mReader, mBase);
-
-            // Load all land data for now. A future optimisation may only load non-base data
-            // if a suitable mechanism for avoiding race conditions can be established.
-            if (index!=-1/* && !mBase*/)
-                mLand.getRecord (index).get().loadData (
-                    ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR |
-                    ESM::Land::DATA_VTEX);
-
-            break;
-        }
+        case ESM::REC_LAND: mLand.load(*mReader, mBase); break;
 
         case ESM::REC_CELL:
         {
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index ea6eefb88..7849aab92 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -4,6 +4,7 @@
 #include <components/esm/esmreader.hpp>
 
 #include "collection.hpp"
+#include "land.hpp"
 
 namespace CSMWorld
 {
@@ -39,6 +40,22 @@ namespace CSMWorld
         record.load (reader, isDeleted);
     }
 
+    template<>
+    inline void IdCollection<Land, IdAccessor<Land> >::loadRecord (Land& record,
+        ESM::ESMReader& reader, bool& isDeleted)
+    {
+        record.load (reader, isDeleted);
+
+        // Load all land data for now. A future optimisation may only load non-base data
+        // if a suitable mechanism for avoiding race conditions can be established.
+        int flags = ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML |
+            ESM::Land::DATA_VCLR | ESM::Land::DATA_VTEX;
+        record.loadData (flags);
+
+        // Prevent data from being reloaded.
+        record.mContext.filename.clear();
+    }
+
     template<typename ESXRecordT, typename IdAccessorT>
     int IdCollection<ESXRecordT, IdAccessorT>::load (ESM::ESMReader& reader, bool base)
     {
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index c81675556..6f118c1ab 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -196,8 +196,8 @@ namespace ESM
         for (int i = 0; i < LAND_NUM_VERTS; ++i)
         {
             mLandData->mNormals[i*3+0] = 0;
-            mLandData->mNormals[i*3+1] = -1;
-            mLandData->mNormals[i*3+2] = 0;
+            mLandData->mNormals[i*3+1] = 0;
+            mLandData->mNormals[i*3+2] = 127;
         }
         for (int i = 0; i < LAND_NUM_TEXTURES; ++i)
             mLandData->mTextures[i] = 0;