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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwworld/worldimp.cpp
View File

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

42
components/esm/loadclot.cpp
View File

@ -8,33 +8,34 @@ namespace ESM
{
unsigned int Clothing::sRecordId = REC_CLOT;
void Clothing::load(ESMReader &esm)
{
mModel = esm.getHNString("MODL");
mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "CTDT", 12);
void Clothing::load(ESMReader &esm)
{
mModel = esm.getHNString("MODL");
mName = esm.getHNOString("FNAM");
esm.getHNT(mData, "CTDT", 12);
mScript = esm.getHNOString("SCRI");
mIcon = esm.getHNOString("ITEX");
mScript = esm.getHNOString("SCRI");
mIcon = esm.getHNOString("ITEX");
mParts.load(esm);
mParts.load(esm);
mEnchant = esm.getHNOString("ENAM");
}
void Clothing::save(ESMWriter &esm) const
{
esm.writeHNCString("MODL", mModel);
esm.writeHNOCString("FNAM", mName);
esm.writeHNT("CTDT", mData, 12);
mEnchant = esm.getHNOString("ENAM");
}
esm.writeHNOCString("SCRI", mScript);
esm.writeHNOCString("ITEX", mIcon);
void Clothing::save(ESMWriter &esm) const
{
esm.writeHNCString("MODL", mModel);
esm.writeHNOCString("FNAM", mName);
esm.writeHNT("CTDT", mData, 12);
mParts.save(esm);
esm.writeHNOCString("SCRI", mScript);
esm.writeHNOCString("ITEX", mIcon);
esm.writeHNOCString("ENAM", mEnchant);
}
mParts.save(esm);
esm.writeHNOCString("ENAM", mEnchant);
}
void Clothing::blank()
{
@ -46,7 +47,6 @@ void Clothing::save(ESMWriter &esm) const
mName.clear();
mModel.clear();
mIcon.clear();
mIcon.clear();
mEnchant.clear();
mScript.clear();
}