From f7ebd9b9b48fc2dc236824a582555d280299cbdc Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 10 May 2023 22:52:59 +0200 Subject: [PATCH] Avoid old C-style cast --- apps/openmw/mwrender/localmap.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index a71ab61f3c..98f39603d5 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -468,7 +468,8 @@ namespace MWRender int texU = static_cast((sFogOfWarResolution - 1) * nX); int texV = static_cast((sFogOfWarResolution - 1) * nY); - uint32_t clr = ((const uint32_t*)segment.mFogOfWarImage->data())[texV * sFogOfWarResolution + texU]; + const std::uint32_t clr + = reinterpret_cast(segment.mFogOfWarImage->data())[texV * sFogOfWarResolution + texU]; uint8_t alpha = (clr >> 24); return alpha < 200; } @@ -536,7 +537,7 @@ namespace MWRender if (!segment.mFogOfWarImage || !segment.mMapTexture) continue; - uint32_t* data = (uint32_t*)segment.mFogOfWarImage->data(); + std::uint32_t* data = reinterpret_cast(segment.mFogOfWarImage->data()); bool changed = false; for (int texV = 0; texV < sFogOfWarResolution; ++texV) { @@ -545,10 +546,9 @@ namespace MWRender float sqrDist = square((texU + mx * (sFogOfWarResolution - 1)) - u * (sFogOfWarResolution - 1)) + square((texV + my * (sFogOfWarResolution - 1)) - v * (sFogOfWarResolution - 1)); - uint32_t clr = *(uint32_t*)data; - uint8_t alpha = (clr >> 24); - alpha = std::min(alpha, (uint8_t)(std::clamp(sqrDist / sqrExploreRadius, 0.f, 1.f) * 255)); - uint32_t val = (uint32_t)(alpha << 24); + const std::uint8_t alpha = std::min( + *data >> 24, std::clamp(sqrDist / sqrExploreRadius, 0.f, 1.f) * 255); + std::uint32_t val = static_cast(alpha << 24); if (*data != val) { *data = val;