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

Change mWnam type to std::array

Browse Source
This commit is contained in:
elsid 2023-08-12 13:29:15 +02:00
parent 0cb37742cb
commit 6f3b7072ac
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esm3/loadland.cpp
View File

@ -94,7 +94,7 @@ namespace ESM
mDataTypes |= DATA_VHGT; mDataTypes |= DATA_VHGT;
break; break;
case fourCC("WNAM"): case fourCC("WNAM"):
esm.getHExact(mWnam, sizeof(mWnam)); esm.getHExact(mWnam.data(), mWnam.size());
mDataTypes |= DATA_WNAM; mDataTypes |= DATA_WNAM;
break; break;
case fourCC("VCLR"): case fourCC("VCLR"):
@ -325,9 +325,9 @@ namespace ESM
, mY(land.mY) , mY(land.mY)
, mContext(land.mContext) , mContext(land.mContext)
, mDataTypes(land.mDataTypes) , mDataTypes(land.mDataTypes)
, mWnam(land.mWnam)
, mLandData(land.mLandData != nullptr ? std::make_unique<LandData>(*land.mLandData) : nullptr) , mLandData(land.mLandData != nullptr ? std::make_unique<LandData>(*land.mLandData) : nullptr)
{ {
std::copy(land.mWnam, land.mWnam + LAND_GLOBAL_MAP_LOD_SIZE, mWnam);
} }
Land& Land::operator=(const Land& land) Land& Land::operator=(const Land& land)

3
components/esm3/loadland.hpp
View File

@ -1,6 +1,7 @@
#ifndef OPENMW_ESM_LAND_H #ifndef OPENMW_ESM_LAND_H
#define OPENMW_ESM_LAND_H #define OPENMW_ESM_LAND_H
#include <array>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
@ -125,7 +126,7 @@ namespace ESM
}; };
// low-LOD heightmap (used for rendering the global map) // low-LOD heightmap (used for rendering the global map)
std::int8_t mWnam[LAND_GLOBAL_MAP_LOD_SIZE]; std::array<std::int8_t, LAND_GLOBAL_MAP_LOD_SIZE> mWnam;
void load(ESMReader& esm, bool& isDeleted); void load(ESMReader& esm, bool& isDeleted);
void save(ESMWriter& esm, bool isDeleted = false) const; void save(ESMWriter& esm, bool isDeleted = false) const;