From 4ed1ad75d1c1699b822ffe88309453356204ed91 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sun, 2 Apr 2023 02:27:30 +0200 Subject: [PATCH] /W4: Fix warning caused by conversion from uint32 to uint8 Prune the rest explicitly with a bit mask. --- r5dev/mathlib/mathlib.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/r5dev/mathlib/mathlib.h b/r5dev/mathlib/mathlib.h index 36c2bcb3..cc407ef4 100644 --- a/r5dev/mathlib/mathlib.h +++ b/r5dev/mathlib/mathlib.h @@ -1741,7 +1741,7 @@ FORCEINLINE unsigned char RoundFloatToByte(float f) #ifdef Assert Assert(nResult >= 0 && nResult <= 255); #endif - return nResult; + return unsigned char(nResult); #endif } @@ -2604,13 +2604,13 @@ FORCEINLINE float* UnpackNormal_UBYTE4(const unsigned int* pPackedNormal, float* unsigned char cX, cY; if (bIsTangent) { - cX = *pPackedNormal >> 16; // Unpack Z - cY = *pPackedNormal >> 24; // Unpack W + cX = (*pPackedNormal >> 16) & UINT8_MAX; // Unpack Z + cY = (*pPackedNormal >> 24) & UINT8_MAX; // Unpack W } else { - cX = *pPackedNormal >> 0; // Unpack X - cY = *pPackedNormal >> 8; // Unpack Y + cX = (*pPackedNormal >> 0) & UINT8_MAX; // Unpack X + cY = (*pPackedNormal >> 8) & UINT8_MAX; // Unpack Y } float x = cX - 128.0f;