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

Cleanup(loadcell): Rename mHasWater to mHasWaterHeightSub for clarity.

Browse source
This commit is contained in:
Dave Corley 2024-02-20 08:39:43 -06:00
parent f95cad07f2
commit d04572ac84
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/esm3/loadcell.cpp
View file

@ -118,7 +118,7 @@ namespace ESM
bool overriding = !mName.empty();
bool isLoaded = false;
mHasAmbi = false;
mHasWater = false;
mHasWaterHeightSub = false;
while (!isLoaded && esm.hasMoreSubs())
{
esm.getSubName();
@ -132,7 +132,7 @@ namespace ESM
case fourCC("WHGT"):
float waterLevel;
esm.getHT(waterLevel);
mHasWater = true;
mHasWaterHeightSub = true;
if (!std::isfinite(waterLevel))
{
if (!overriding)
@ -193,7 +193,7 @@ namespace ESM
// 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 (mHasWater)
if (mHasWaterHeightSub)
esm.writeHNT("WHGT", mWater);
if (mData.mFlags & QuasiEx)
esm.writeHNOCRefId("RGNN", mRegion);
@ -322,7 +322,7 @@ namespace ESM
mData.mY = 0;
mHasAmbi = true;
mHasWater = 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)
, mHasWater(false)
, mHasWaterHeightSub(false)
, mMapColor(0)
, mRefNumCounter(0)
{
@ -131,7 +131,7 @@ namespace ESM
bool mHasAmbi;
float mWater; // Water level
bool mHasWater;
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,7 +163,7 @@ namespace ESM
bool hasWater() const { return ((mData.mFlags & HasWater) != 0) || isExterior(); }
void setHasWater(bool hasWater) { mHasWater = hasWater; }
void setHasWater(bool hasWater) { mHasWaterHeightSub = hasWater; }
bool hasAmbient() const { return mHasAmbi; }