mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 13:15:34 +00:00
Code Issues Releases Wiki Activity

don't try to retrieve land data from non-predefined cells.

Browse source
This commit is contained in:
scrawl 2012-05-17 18:11:34 +02:00
parent 6b74fec8ed
commit ae77e7b0d8
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwworld/scene.cpp
View file

@ -82,7 +82,11 @@ namespace MWWorld
} }
if (!((*iter)->cell->data.flags & ESM::Cell::Interior)) if (!((*iter)->cell->data.flags & ESM::Cell::Interior))
mPhysics->removeHeightField( (*iter)->cell->data.gridX, (*iter)->cell->data.gridY ); {
ESM::Land* land = mWorld->getStore().lands.search((*iter)->cell->data.gridX,(*iter)->cell->data.gridY);
if (land)
mPhysics->removeHeightField( (*iter)->cell->data.gridX, (*iter)->cell->data.gridY );
}
} }
mRendering.removeCell(*iter); mRendering.removeCell(*iter);
@ -118,9 +122,10 @@ namespace MWWorld
if (!(cell->cell->data.flags & ESM::Cell::Interior)) if (!(cell->cell->data.flags & ESM::Cell::Interior))
{ {
ESM::Land* land = mWorld->getStore().lands.search(cell->cell->data.gridX,cell->cell->data.gridY); ESM::Land* land = mWorld->getStore().lands.search(cell->cell->data.gridX,cell->cell->data.gridY);
mPhysics->addHeightField (land->landData->heights, if (land)
cell->cell->data.gridX, cell->cell->data.gridY, mPhysics->addHeightField (land->landData->heights,
0, ( worldsize/(verts-1) ), verts); cell->cell->data.gridX, cell->cell->data.gridY,
0, ( worldsize/(verts-1) ), verts);
} }
mRendering.configureAmbient(*cell); mRendering.configureAmbient(*cell);