mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

copy mWnam record in copy constructor and custom assignment operator

Browse Source
This commit is contained in:
Nelsson Huotari 2019-10-06 13:23:49 +03:00
parent 2e05e0e829
commit 7f030fc3ee
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/esm/loadland.cpp
View File

@ -323,7 +323,12 @@ namespace ESM
: mFlags (land.mFlags), mX (land.mX), mY (land.mY), mPlugin (land.mPlugin), : mFlags (land.mFlags), mX (land.mX), mY (land.mY), mPlugin (land.mPlugin),
mContext (land.mContext), mDataTypes (land.mDataTypes), mContext (land.mContext), mDataTypes (land.mDataTypes),
mLandData (land.mLandData ? new LandData (*land.mLandData) : 0) mLandData (land.mLandData ? new LandData (*land.mLandData) : 0)
{} {
for (int i = 0; i < LAND_GLOBAL_MAP_LOD_SIZE; ++i)
{
mWnam[i] = static_cast<signed char>(land.mWnam[i]);
}
}
Land& Land::operator= (Land land) Land& Land::operator= (Land land)
{ {
@ -340,6 +345,10 @@ namespace ESM
std::swap (mContext, land.mContext); std::swap (mContext, land.mContext);
std::swap (mDataTypes, land.mDataTypes); std::swap (mDataTypes, land.mDataTypes);
std::swap (mLandData, land.mLandData); std::swap (mLandData, land.mLandData);
for (int i = 0; i < LAND_GLOBAL_MAP_LOD_SIZE; ++i)
{
std::swap (mWnam[i], land.mWnam[i]);
}
} }
const Land::LandData *Land::getLandData (int flags) const const Land::LandData *Land::getLandData (int flags) const