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

Merge branch 'size' into 'master'

Browse source 
Reduce a bit the size of getHT

See merge request OpenMW/openmw!975
This commit is contained in:
jvoisin 2021-07-12 11:04:07 +00:00
commit f9667683e7
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esm/esmreader.cpp
View file

@ -198,7 +198,7 @@ void ESMReader::skipHSubSize(int size)
{
skipHSub();
if (static_cast<int> (mCtx.leftSub) != size)
fail("skipHSubSize() mismatch");
reportSubSizeMismatch(mCtx.leftSub, size);
}
void ESMReader::skipHSubUntil(const char *name)

13
components/esm/esmreader.hpp
View file

@ -134,11 +134,7 @@ public:
{
getSubHeader();
if (mCtx.leftSub != sizeof(X))
{
fail("getHT(): subrecord size mismatch,requested "
+ std::to_string(sizeof(X)) + ", got"
+ std::to_string(mCtx.leftSub));
}
reportSubSizeMismatch(sizeof(X), mCtx.leftSub);
getT(x);
}
@ -261,6 +257,13 @@ public:
size_t getFileSize() const { return mFileSize; }
private:
[[noreturn]] void reportSubSizeMismatch(size_t want, size_t got) {
fail("subrecord size mismatch, requested " +
std::to_string(want) +
", got" +
std::to_string(got));
}
void clearCtx();
Files::IStreamPtr mEsm;