mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:53:53 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-07-31 22:12:07 +02:00
commit 24273f338b
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -236,7 +236,6 @@ namespace MWWorld
// Rebuild player // Rebuild player
setupPlayer(); setupPlayer();
const ESM::NPC* playerNpc = mStore.get<ESM::NPC>().find("player");
MWWorld::Ptr player = mPlayer->getPlayer(); MWWorld::Ptr player = mPlayer->getPlayer();
renderPlayer(); renderPlayer();
mRendering->resetCamera(); mRendering->resetCamera();
@ -247,9 +246,6 @@ namespace MWWorld
// make sure to do this so that local scripts from items that were in the players inventory are removed // make sure to do this so that local scripts from items that were in the players inventory are removed
mLocalScripts.clear(); mLocalScripts.clear();
MWWorld::Class::get(player).getContainerStore(player).fill(playerNpc->mInventory, "", mStore);
MWWorld::Class::get(player).getInventoryStore(player).autoEquip(player);
MWBase::Environment::get().getWindowManager()->updatePlayer(); MWBase::Environment::get().getWindowManager()->updatePlayer();
ESM::Position pos; ESM::Position pos;