Commit e37bcc26 authored by Alexei Dobrohotov's avatar Alexei Dobrohotov Committed by GitHub

Merge pull request #2549 from unelsson/wnamfix

OpenMW-CS: Fix minimap corruption
parents 9a277147 3deebf02
Pipeline #86910368 passed with stage
......@@ -154,6 +154,7 @@
Bug #5168: Force1stPerson and Force3rdPerson commands are not really force view change
Bug #5169: Nested levelled items/creatures have significantly higher chance not to spawn
Bug #5175: Random script function returns an integer value
Bug #5177: Editor: Unexplored map tiles get corrupted after a file with terrain is saved
Feature #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls
......
......@@ -102,6 +102,7 @@ Editor Bug Fixes:
- Cloned, added, or moved instances no longer disappear at load-time (#4748)
- "Clear" function in the content selector no longer tries to execute a "Remove" action on an empty file list (#4757)
- Engine no longer tries to swap buffers of windows which weren't exposed to Qt's window management system (#4911)
- Minimap doesn't get corrupted, when editing new omwgame (#5177)
Miscellaneous:
- Upgraded to FFMPEG3 for media decoding (#4686)
......
......@@ -323,7 +323,9 @@ namespace ESM
: mFlags (land.mFlags), mX (land.mX), mY (land.mY), mPlugin (land.mPlugin),
mContext (land.mContext), mDataTypes (land.mDataTypes),
mLandData (land.mLandData ? new LandData (*land.mLandData) : 0)
{}
{
std::copy(land.mWnam, land.mWnam + LAND_GLOBAL_MAP_LOD_SIZE, mWnam);
}
Land& Land::operator= (Land land)
{
......@@ -340,6 +342,7 @@ namespace ESM
std::swap (mContext, land.mContext);
std::swap (mDataTypes, land.mDataTypes);
std::swap (mLandData, land.mLandData);
std::swap (mWnam, land.mWnam);
}
const Land::LandData *Land::getLandData (int flags) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment