mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 07:15:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2549 from unelsson/wnamfix

Browse source 
OpenMW-CS: Fix minimap corruption
This commit is contained in:
Alexei Dobrohotov 2019-10-07 02:13:51 +03:00 committed by GitHub
commit e37bcc26ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -154,6 +154,7 @@
Bug #5168: Force1stPerson and Force3rdPerson commands are not really force view change 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 #5169: Nested levelled items/creatures have significantly higher chance not to spawn
Bug #5175: Random script function returns an integer value 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 #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls Feature #3025: Analogue gamepad movement controls

1
CHANGELOG_PR.md
View file

@ -102,6 +102,7 @@ Editor Bug Fixes:
- Cloned, added, or moved instances no longer disappear at load-time (#4748) - 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) - "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) - 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: Miscellaneous:
- Upgraded to FFMPEG3 for media decoding (#4686) - Upgraded to FFMPEG3 for media decoding (#4686)

5
components/esm/loadland.cpp
View file

@ -323,7 +323,9 @@ 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)
{} {
std::copy(land.mWnam, land.mWnam + LAND_GLOBAL_MAP_LOD_SIZE, mWnam);
}
Land& Land::operator= (Land land) Land& Land::operator= (Land land)
{ {
@ -340,6 +342,7 @@ 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);
std::swap (mWnam, land.mWnam);
} }
const Land::LandData *Land::getLandData (int flags) const const Land::LandData *Land::getLandData (int flags) const