mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-04 14:45:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'masterindexloadfix' into 'master'

Browse source 
[OpenMW-CS] Load master index from refId to mContentFile

See merge request OpenMW/openmw!445
This commit is contained in:
psi29a 2020-12-09 10:12:10 +00:00
commit 0e5af74a2f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/opencs/model/world/refcollection.cpp
View file

@ -64,10 +64,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
// ignore content file number // ignore content file number
std::map<ESM::RefNum, std::string>::iterator iter = cache.begin(); std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
ref.mRefNum.mIndex = ref.mRefNum.mIndex & 0x00ffffff; unsigned int thisIndex = ref.mRefNum.mIndex & 0x00ffffff;
if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
for (; iter != cache.end(); ++iter) for (; iter != cache.end(); ++iter)
{ {
if (ref.mRefNum.mIndex == iter->first.mIndex) if (thisIndex == iter->first.mIndex)
break; break;
} }