mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-04 02:41:19 +00:00
Merge branch 'mnam' into 'master'
Read STAT::MNAM See merge request OpenMW/openmw!3273
This commit is contained in:
commit
a99aa38d45
@ -69,10 +69,21 @@ void ESM4::Static::load(ESM4::Reader& reader)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case ESM4::SUB_MNAM:
|
||||||
|
{
|
||||||
|
for (std::string& level : mLOD)
|
||||||
|
{
|
||||||
|
level.resize(260);
|
||||||
|
reader.get(level.data(), 260);
|
||||||
|
size_t end = level.find('\0');
|
||||||
|
if (end != std::string::npos)
|
||||||
|
level.erase(end);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
case ESM4::SUB_MODS:
|
case ESM4::SUB_MODS:
|
||||||
case ESM4::SUB_OBND:
|
case ESM4::SUB_OBND:
|
||||||
case ESM4::SUB_DNAM:
|
case ESM4::SUB_DNAM:
|
||||||
case ESM4::SUB_MNAM:
|
|
||||||
case ESM4::SUB_BRUS: // FONV
|
case ESM4::SUB_BRUS: // FONV
|
||||||
case ESM4::SUB_RNAM: // FONV
|
case ESM4::SUB_RNAM: // FONV
|
||||||
reader.skipSubRecordData();
|
reader.skipSubRecordData();
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#ifndef ESM4_STAT_H
|
#ifndef ESM4_STAT_H
|
||||||
#define ESM4_STAT_H
|
#define ESM4_STAT_H
|
||||||
|
|
||||||
|
#include <array>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@ -53,6 +54,7 @@ namespace ESM4
|
|||||||
|
|
||||||
float mBoundRadius;
|
float mBoundRadius;
|
||||||
std::vector<std::uint8_t> mMODT; // FIXME texture hash
|
std::vector<std::uint8_t> mMODT; // FIXME texture hash
|
||||||
|
std::array<std::string, 4> mLOD;
|
||||||
|
|
||||||
void load(ESM4::Reader& reader);
|
void load(ESM4::Reader& reader);
|
||||||
// void save(ESM4::Writer& writer) const;
|
// void save(ESM4::Writer& writer) const;
|
||||||
|
Loading…
Reference in New Issue
Block a user