From c0f890b3236c1e9da892fb444bd5884d76888e66 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Wed, 11 Mar 2026 03:27:59 +1100 Subject: [PATCH] Use fixed-width casts in skin bitmask macros --- Minecraft.Client/Platform/Common/Minecraft_Macros.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Minecraft.Client/Platform/Common/Minecraft_Macros.h b/Minecraft.Client/Platform/Common/Minecraft_Macros.h index 4f1f096a4..1c5b83e76 100644 --- a/Minecraft.Client/Platform/Common/Minecraft_Macros.h +++ b/Minecraft.Client/Platform/Common/Minecraft_Macros.h @@ -1,6 +1,8 @@ #pragma once +#include + // 3 bit user index // 5 bits alpha // 1 bit decoration @@ -35,8 +37,8 @@ #define MAKE_SKIN_BITMASK(bDlcSkin, dwSkinId) ( (bDlcSkin?0x80000000:0) | (dwSkinId & 0x7FFFFFFF) ) #define IS_SKIN_ID_IN_RANGE(dwSkinId) (dwSkinId <= 0x7FFFFFFF) -#define GET_DLC_SKIN_ID_FROM_BITMASK(uiBitmask) (((DWORD)uiBitmask)&0x7FFFFFFF) -#define GET_UGC_SKIN_ID_FROM_BITMASK(uiBitmask) (((DWORD)uiBitmask)&0x7FFFFFE0) -#define GET_DEFAULT_SKIN_ID_FROM_BITMASK(uiBitmask) (((DWORD)uiBitmask)&0x0000001F) -#define GET_IS_DLC_SKIN_FROM_BITMASK(uiBitmask) ((((DWORD)uiBitmask)&0x80000000)?true:false) +#define GET_DLC_SKIN_ID_FROM_BITMASK(uiBitmask) (static_cast(uiBitmask) & 0x7FFFFFFF) +#define GET_UGC_SKIN_ID_FROM_BITMASK(uiBitmask) (static_cast(uiBitmask) & 0x7FFFFFE0) +#define GET_DEFAULT_SKIN_ID_FROM_BITMASK(uiBitmask) (static_cast(uiBitmask) & 0x0000001F) +#define GET_IS_DLC_SKIN_FROM_BITMASK(uiBitmask) ((static_cast(uiBitmask) & 0x80000000) ? true : false)