mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'savecontainers' into 'master'

Browse Source 
Save and load container records

Closes #5668

See merge request OpenMW/openmw!384
This commit is contained in:
psi29a 2020-10-29 20:35:43 +00:00
commit 4bbed3c860
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwstate/statemanagerimp.cpp
View File

@ -451,6 +451,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
case ESM::REC_LEVC:
case ESM::REC_LEVI:
case ESM::REC_CREA:
case ESM::REC_CONT:
MWBase::Environment::get().getWorld()->readRecord(reader, n.intval, contentFileMap);
break;

5
apps/openmw/mwworld/esmstore.cpp
View File

@ -345,7 +345,8 @@ void ESMStore::validate()
+mWeapons.getDynamicSize()
+mCreatureLists.getDynamicSize()
+mItemLists.getDynamicSize()
+mCreatures.getDynamicSize();
+mCreatures.getDynamicSize()
+mContainers.getDynamicSize();
}
void ESMStore::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
@ -368,6 +369,7 @@ void ESMStore::validate()
mItemLists.write (writer, progress);
mCreatureLists.write (writer, progress);
mCreatures.write (writer, progress);
mContainers.write (writer, progress);
}
bool ESMStore::readRecord (ESM::ESMReader& reader, uint32_t type)
@ -386,6 +388,7 @@ void ESMStore::validate()
case ESM::REC_LEVI:
case ESM::REC_LEVC:
case ESM::REC_CREA:
case ESM::REC_CONT:
mStores[type]->read (reader);
return true;