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

Skip load cell ref when there is no need

Browse source 
Primarily to avoid temporary allocations by ESMReader::getHString.
This commit is contained in:
elsid 2022-04-08 17:08:18 +02:00
parent f4923204bf
commit bbfdb347bd
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
9 changed files with 219 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/objectpaging.cpp
View file

@ -435,7 +435,7 @@ namespace MWRender
cMRef.mRefNum.mIndex = 0;
bool deleted = false;
bool moved = false;
while(cell->getNextRef(esm[index], ref, deleted, cMRef, moved))
while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
{
if (moved)
continue;

4
apps/openmw/mwworld/cellstore.cpp
View file

@ -568,7 +568,7 @@ namespace MWWorld
cMRef.mRefNum.mIndex = 0;
bool deleted = false;
bool moved = false;
while(mCell->getNextRef(esm[index], ref, deleted, cMRef, moved))
while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
{
if (deleted || moved)
continue;
@ -628,7 +628,7 @@ namespace MWWorld
cMRef.mRefNum.mIndex = 0;
bool deleted = false;
bool moved = false;
while(mCell->getNextRef(esm[index], ref, deleted, cMRef, moved))
while (ESM::Cell::getNextRef(esm[index], ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
{
if (moved)
continue;

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

@ -448,7 +448,7 @@ namespace MWWorld
//
// Get regular moved reference data. Adapted from CellStore::loadRefs. Maybe we can optimize the following
// implementation when the oher implementation works as well.
while (cell->getNextRef(esm, ref, deleted, cMRef, moved))
while (ESM::Cell::getNextRef(esm, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyMoved))
{
if (!moved)
continue;