Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-09 03:57:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 39

Merge remote-tracking branch 'puppykevin/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-05-30 11:42:19 +02:00
commit f5e587f566
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -252,7 +252,6 @@ namespace MWWorld
mProjectileManager->clear(); mProjectileManager->clear();
mLocalScripts.clear(); mLocalScripts.clear();
mPlayer->clear();
mWorldScene->changeToVoid(); mWorldScene->changeToVoid();
@ -261,6 +260,7 @@ namespace MWWorld
if (mPlayer) if (mPlayer)
{ {
mPlayer->clear();
mPlayer->setCell(0); mPlayer->setCell(0);
mPlayer->getPlayer().getRefData() = RefData(); mPlayer->getPlayer().getRefData() = RefData();
mPlayer->set(mStore.get<ESM::NPC>().find ("player")); mPlayer->set(mStore.get<ESM::NPC>().find ("player"));

2
components/esm/loadclot.cpp
View file

@ -22,6 +22,7 @@ void Clothing::load(ESMReader &esm)
mEnchant = esm.getHNOString("ENAM"); mEnchant = esm.getHNOString("ENAM");
} }
void Clothing::save(ESMWriter &esm) const void Clothing::save(ESMWriter &esm) const
{ {
esm.writeHNCString("MODL", mModel); esm.writeHNCString("MODL", mModel);
@ -46,7 +47,6 @@ void Clothing::save(ESMWriter &esm) const
mName.clear(); mName.clear();
mModel.clear(); mModel.clear();
mIcon.clear(); mIcon.clear();
mIcon.clear();
mEnchant.clear(); mEnchant.clear();
mScript.clear(); mScript.clear();
} }