From d89db4917a08f699fa11d9753c640920cda81a54 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 21:38:16 +1100 Subject: [PATCH] Use standard small-id types in player options --- .../Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.h | 6 ++++-- Minecraft.Client/Platform/Common/UI/UIStructs.h | 2 +- .../Platform/Common/XUI/XUI_InGamePlayerOptions.h | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.h index 670da1d4e..a4eeaa87c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "UIScene.h" class UIScene_InGamePlayerOptionsMenu : public UIScene @@ -27,7 +29,7 @@ private: bool m_bShouldNavBack; bool m_editingSelf; - BYTE m_networkSmallId; + std::uint8_t m_networkSmallId; unsigned int m_playerPrivileges; UIControl_Label m_labelGamertag; @@ -87,4 +89,4 @@ private: used after changing the moderator checkbox. */ void resetCheatCheckboxes(); -}; \ No newline at end of file +}; diff --git a/Minecraft.Client/Platform/Common/UI/UIStructs.h b/Minecraft.Client/Platform/Common/UI/UIStructs.h index cda4246ed..d4b9a09ba 100644 --- a/Minecraft.Client/Platform/Common/UI/UIStructs.h +++ b/Minecraft.Client/Platform/Common/UI/UIStructs.h @@ -388,7 +388,7 @@ DLCOffersParam; typedef struct _InGamePlayerOptionsInitData { int iPad; - BYTE networkSmallId; + std::uint8_t networkSmallId; unsigned int playerPrivileges; } InGamePlayerOptionsInitData; diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.h b/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.h index 487be5afc..cbd137a2f 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.h +++ b/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "../Media/xuiscene_ingame_player_options.h" class CScene_InGamePlayerOptions : public CXuiSceneImpl @@ -79,7 +81,7 @@ public: private: bool m_editingSelf; int m_iPad; - BYTE m_networkSmallId; + std::uint8_t m_networkSmallId; unsigned int m_playerPrivileges; D3DXVECTOR3 m_OriginalPosition;