mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 00:36:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2724 from akortunov/factions

Browse source 
Cleanup ownership for items in containers
This commit is contained in:
Bret Curtis 2020-03-18 10:00:36 +01:00 committed by GitHub
commit 79517f3f42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -290,7 +290,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
item.getCellRef().setOwner(""); item.getCellRef().setOwner("");
item.getCellRef().resetGlobalVariable(); item.getCellRef().resetGlobalVariable();
item.getCellRef().setFaction(""); item.getCellRef().setFaction("");
item.getCellRef().setFactionRank(-1); item.getCellRef().setFactionRank(-2);
// must reset the RefNum on the copied item, so that the RefNum on the original item stays unique // must reset the RefNum on the copied item, so that the RefNum on the original item stays unique
// maybe we should do this in the copy constructor instead? // maybe we should do this in the copy constructor instead?

8
components/esm/cellref.cpp
View file

@ -153,14 +153,20 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
esm.writeHNT("XSCL", scale); esm.writeHNT("XSCL", scale);
} }
if (!inInventory)
esm.writeHNOCString("ANAM", mOwner); esm.writeHNOCString("ANAM", mOwner);
esm.writeHNOCString("BNAM", mGlobalVariable); esm.writeHNOCString("BNAM", mGlobalVariable);
esm.writeHNOCString("XSOL", mSoul); esm.writeHNOCString("XSOL", mSoul);
if (!inInventory)
{
esm.writeHNOCString("CNAM", mFaction); esm.writeHNOCString("CNAM", mFaction);
if (mFactionRank != -2) { if (mFactionRank != -2)
{
esm.writeHNT("INDX", mFactionRank); esm.writeHNT("INDX", mFactionRank);
} }
}
if (mEnchantmentCharge != -1) if (mEnchantmentCharge != -1)
esm.writeHNT("XCHG", mEnchantmentCharge); esm.writeHNT("XCHG", mEnchantmentCharge);