Merge remote branch 'lgro/master'

apps/openmw/mwrender/terrain.cpp

@@ -97,9 +97,12 @@ namespace MWRender
 
         ESM::Land* land = mEnvironment.mWorld->getStore().lands.search(cellX, cellY);
         if ( land != NULL )
+        {
+            if (!land->dataLoaded)
             {
                 land->loadData();
             }
+        }
 
         //split the cell terrain into four segments
         const int numTextures = ESM::Land::LAND_TEXTURE_SIZE/2;
@@ -419,8 +422,12 @@ namespace MWRender
 
         ESM::Land* land = mEnvironment.mWorld->getStore().lands.search(cellX, cellY);
         if ( land != NULL )
+        {
+            if (!land->dataLoaded)
             {
                 land->loadData();
+            }
+
             return land->landData
                        ->textures[y * ESM::Land::LAND_TEXTURE_SIZE + x];
         }

components/esm/loadland.cpp

@@ -2,6 +2,24 @@
 
 namespace ESM
 {
+
+Land::Land()
+    : flags(0)
+    , X(0)
+    , Y(0)
+    , mEsm(NULL)
+    , hasData(false)
+    , dataLoaded(false)
+    , landData(NULL)
+{
+}
+
+Land::~Land()
+{
+    delete landData;
+}
+
+
 void Land::load(ESMReader &esm)
 {
     mEsm = &esm;

components/esm/loadland.hpp

@@ -11,6 +11,9 @@ namespace ESM
 
 struct Land
 {
+    Land();
+    ~Land();
+
     int flags; // Only first four bits seem to be used, don't know what
     // they mean.
     int X, Y; // Map coordinates.
@@ -77,6 +80,11 @@ struct Land
      * Frees memory allocated for land data
      */
     void unloadData();
+
+    private:
+        Land(const Land& land);
+        Land& operator=(const Land& land);
 };
+
 }
 #endif