From ce2787e15e7581c2aae5cd5a0b40203a5b3fe017 Mon Sep 17 00:00:00 2001 From: Dave Corley Date: Thu, 22 Feb 2024 03:23:23 -0600 Subject: [PATCH] Cleanup(loadcell): Rename setHasWater to setHasWaterHeightSub --- apps/opencs/model/world/nestedcoladapterimp.cpp | 2 +- components/esm3/loadcell.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp index ea3a3bde26..8b8c7b17be 100644 --- a/apps/opencs/model/world/nestedcoladapterimp.cpp +++ b/apps/opencs/model/world/nestedcoladapterimp.cpp @@ -998,7 +998,7 @@ namespace CSMWorld if (isInterior && interiorWater) { cell.mWater = value.toFloat(); - cell.setHasWater(true); + cell.setHasWaterHeightSub(true); } else return; // return without saving diff --git a/components/esm3/loadcell.hpp b/components/esm3/loadcell.hpp index a22110be32..3f16bcca31 100644 --- a/components/esm3/loadcell.hpp +++ b/components/esm3/loadcell.hpp @@ -163,7 +163,7 @@ namespace ESM bool hasWater() const { return ((mData.mFlags & HasWater) != 0) || isExterior(); } - void setHasWater(bool hasWater) { mHasWaterHeightSub = hasWater; } + void setHasWaterHeightSub(bool hasWater) { mHasWaterHeightSub = hasWater; } bool hasAmbient() const { return mHasAmbi; }