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

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-11-22 10:02:39 +01:00
commit e078d55159
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwworld/worldimp.cpp
View file

@ -749,12 +749,16 @@ namespace MWWorld
void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position) void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
{ {
return mWorldScene->changeToInteriorCell(cellName, position); removeContainerScripts(getPlayer().getPlayer());
mWorldScene->changeToInteriorCell(cellName, position);
addContainerScripts(getPlayer().getPlayer(), getPlayer().getPlayer().getCell());
} }
void World::changeToExteriorCell (const ESM::Position& position) void World::changeToExteriorCell (const ESM::Position& position)
{ {
return mWorldScene->changeToExteriorCell(position); removeContainerScripts(getPlayer().getPlayer());
mWorldScene->changeToExteriorCell(position);
addContainerScripts(getPlayer().getPlayer(), getPlayer().getPlayer().getCell());
} }
void World::markCellAsUnchanged() void World::markCellAsUnchanged()
@ -882,6 +886,7 @@ namespace MWWorld
int cellY = newCell.mCell->getGridY(); int cellY = newCell.mCell->getGridY();
mWorldScene->changeCell(cellX, cellY, pos, false); mWorldScene->changeCell(cellX, cellY, pos, false);
} }
addContainerScripts (ptr, &newCell);
} }
else else
{ {