mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

don't do a half finished cell change, when trying to switch to an interior cell that does not exist

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-05-17 17:13:41 +02:00
parent fdfddc8be7
commit 6b74fec8ed
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwworld/scene.cpp
View File

@ -251,6 +251,9 @@ namespace MWWorld
void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position) void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
{ {
std::cout << "Changing to interior\n"; std::cout << "Changing to interior\n";
Ptr::CellStore *cell = mWorld->getInterior(cellName);
// remove active // remove active
CellStoreCollection::iterator active = mActiveCells.begin(); CellStoreCollection::iterator active = mActiveCells.begin();
@ -261,11 +264,9 @@ namespace MWWorld
// Load cell. // Load cell.
std::cout << "cellName:" << cellName << std::endl; std::cout << "cellName:" << cellName << std::endl;
Ptr::CellStore *cell = mWorld->getInterior(cellName);
loadCell (cell); loadCell (cell);
// adjust player // adjust player
mCurrentCell = cell; mCurrentCell = cell;
playerCellChange (cell, position); playerCellChange (cell, position);