mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-03 22:36:41 +00:00
Code Issues Releases Wiki Activity

fixed 2 assertions that caused crashes

Browse source
This commit is contained in:
scrawl 2012-03-01 15:03:43 +01:00
parent fddf7b4dd0
commit 562cc7aa30
1 changed files with 10 additions and 10 deletions

20
apps/openmw/mwrender/terrain.cpp
View file

@ -146,16 +146,16 @@ namespace MWRender
x * numTextures, y * numTextures, x * numTextures, y * numTextures,
numTextures, indexes); numTextures, indexes);
assert( mTerrainGroup->getTerrain(cellX, cellY) == NULL && if (mTerrainGroup->getTerrain(cellX, cellY) == NULL)
"The terrain for this cell already existed" ); {
mTerrainGroup->defineTerrain(terrainX, terrainY, &terrainData); mTerrainGroup->defineTerrain(terrainX, terrainY, &terrainData);
mTerrainGroup->loadTerrain(terrainX, terrainY, true); mTerrainGroup->loadTerrain(terrainX, terrainY, true);
Ogre::Terrain* terrain = mTerrainGroup->getTerrain(terrainX, terrainY); Ogre::Terrain* terrain = mTerrainGroup->getTerrain(terrainX, terrainY);
initTerrainBlendMaps(terrain, store, initTerrainBlendMaps(terrain, store,
x * numTextures, y * numTextures, x * numTextures, y * numTextures,
numTextures, indexes); numTextures, indexes);
}
} }
} }
} }
@ -246,7 +246,7 @@ namespace MWRender
{ {
//NB: All vtex ids are +1 compared to the ltex ids //NB: All vtex ids are +1 compared to the ltex ids
assert((int)ltexIndex >= 0 && 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"); "LAND.VTEX must be within the bounds of the LTEX array");
std::string texture; std::string texture;