From 562cc7aa30f96cabf3d8380696f777f622dcd45c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 1 Mar 2012 15:03:43 +0100
Subject: [PATCH] fixed 2 assertions that caused crashes
---
apps/openmw/mwrender/terrain.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/apps/openmw/mwrender/terrain.cpp b/apps/openmw/mwrender/terrain.cpp
index df5bba7c4..5925ad82a 100644
--- a/apps/openmw/mwrender/terrain.cpp
+++ b/apps/openmw/mwrender/terrain.cpp
@@ -146,16 +146,16 @@ namespace MWRender
x * numTextures, y * numTextures,
numTextures, indexes);
- assert( mTerrainGroup->getTerrain(cellX, cellY) == NULL &&
- "The terrain for this cell already existed" );
- mTerrainGroup->defineTerrain(terrainX, terrainY, &terrainData);
+ if (mTerrainGroup->getTerrain(cellX, cellY) == NULL)
+ {
+ mTerrainGroup->defineTerrain(terrainX, terrainY, &terrainData);
- mTerrainGroup->loadTerrain(terrainX, terrainY, true);
- Ogre::Terrain* terrain = mTerrainGroup->getTerrain(terrainX, terrainY);
- initTerrainBlendMaps(terrain, store,
- x * numTextures, y * numTextures,
- numTextures, indexes);
-
+ mTerrainGroup->loadTerrain(terrainX, terrainY, true);
+ Ogre::Terrain* terrain = mTerrainGroup->getTerrain(terrainX, terrainY);
+ initTerrainBlendMaps(terrain, store,
+ x * numTextures, y * numTextures,
+ numTextures, indexes);
+ }
}
}
}
@@ -246,7 +246,7 @@ namespace MWRender
{
//NB: All vtex ids are +1 compared to the ltex ids
assert((int)ltexIndex >= 0 &&
- store->landTextures->ltex.size() > (size_t)ltexIndex - 1 &&
+ (int)store->landTextures->ltex.size() > (int)ltexIndex - 1 &&
"LAND.VTEX must be within the bounds of the LTEX array");
std::string texture;