mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:59:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'help-i-cant-swim' into 'master'

Browse source 
Fix(editor): Don't save dirty water height values

Closes #7841

See merge request OpenMW/openmw!3881
This commit is contained in:
Alexei Kotov 2024-02-26 21:50:50 +00:00
commit 46f863a32e
5 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -152,6 +152,7 @@
Bug #7796: Absorbed enchantments don't restore magicka
Bug #7832: Ingredient tooltips show magnitude for Fortify Maximum Magicka effect
Bug #7840: First run of the launcher doesn't save viewing distance as the default value
Bug #7841: Editor: "Dirty" water heights are saved in modified CELLs
Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples
Feature #5173: Support for NiFogProperty

1
apps/esmtool/record.cpp
View file

@ -612,7 +612,6 @@ namespace EsmTool
}
else
std::cout << " Map Color: " << Misc::StringUtils::format("0x%08X", mData.mMapColor) << std::endl;
std::cout << " Water Level Int: " << mData.mWaterInt << std::endl;
std::cout << " RefId counter: " << mData.mRefNumCounter << std::endl;
std::cout << " Deleted: " << mIsDeleted << std::endl;
}

3
apps/opencs/model/world/nestedcoladapterimp.cpp
View file

@ -996,7 +996,10 @@ namespace CSMWorld
case 5:
{
if (isInterior && interiorWater)
{
cell.mWater = value.toFloat();
cell.setHasWaterHeightSub(true);
}
else
return; // return without saving
break;

27
components/esm3/loadcell.cpp
View file

@ -118,6 +118,7 @@ namespace ESM
bool overriding = !mName.empty();
bool isLoaded = false;
mHasAmbi = false;
mHasWaterHeightSub = false;
while (!isLoaded && esm.hasMoreSubs())
{
esm.getSubName();
@ -126,13 +127,13 @@ namespace ESM
case fourCC("INTV"):
int32_t waterl;
esm.getHT(waterl);
mHasWaterHeightSub = true;
mWater = static_cast<float>(waterl);
mWaterInt = true;
break;
case fourCC("WHGT"):
float waterLevel;
esm.getHT(waterLevel);
mWaterInt = false;
mHasWaterHeightSub = true;
if (!std::isfinite(waterLevel))
{
if (!overriding)
@ -190,26 +191,16 @@ namespace ESM
if (mData.mFlags & Interior)
{
if (mWaterInt)
{
int32_t water = (mWater >= 0) ? static_cast<int32_t>(mWater + 0.5) : static_cast<int32_t>(mWater - 0.5);
esm.writeHNT("INTV", water);
}
else
{
// Try to avoid saving ambient information when it's unnecessary.
// This is to fix black lighting and flooded water
// in resaved cell records that lack this information.
if (mHasWaterHeightSub)
esm.writeHNT("WHGT", mWater);
}
if (mData.mFlags & QuasiEx)
esm.writeHNOCRefId("RGNN", mRegion);
else
{
// Try to avoid saving ambient lighting information when it's unnecessary.
// This is to fix black lighting in resaved cell records that lack this information.
if (mHasAmbi)
else if (mHasAmbi)
esm.writeHNT("AMBI", mAmbi, 16);
}
}
else
{
esm.writeHNOCRefId("RGNN", mRegion);
@ -324,7 +315,6 @@ namespace ESM
mName.clear();
mRegion = ESM::RefId();
mWater = 0;
mWaterInt = false;
mMapColor = 0;
mRefNumCounter = 0;
@ -333,6 +323,7 @@ namespace ESM
mData.mY = 0;
mHasAmbi = true;
mHasWaterHeightSub = true;
mAmbi.mAmbient = 0;
mAmbi.mSunlight = 0;
mAmbi.mFog = 0;

6
components/esm3/loadcell.hpp
View file

@ -111,7 +111,7 @@ namespace ESM
, mRegion(ESM::RefId())
, mHasAmbi(true)
, mWater(0)
, mWaterInt(false)
, mHasWaterHeightSub(false)
, mMapColor(0)
, mRefNumCounter(0)
{
@ -131,7 +131,7 @@ namespace ESM
bool mHasAmbi;
float mWater; // Water level
bool mWaterInt;
bool mHasWaterHeightSub;
int32_t mMapColor;
// Counter for RefNums. This is only used during content file editing and has no impact on gameplay.
// It prevents overwriting previous refNums, even if they were deleted.
@ -163,6 +163,8 @@ namespace ESM
bool hasWater() const { return ((mData.mFlags & HasWater) != 0) || isExterior(); }
void setHasWaterHeightSub(bool hasWater) { mHasWaterHeightSub = hasWater; }
bool hasAmbient() const { return mHasAmbi; }
void setHasAmbient(bool hasAmbi) { mHasAmbi = hasAmbi; }