From b40e716b2c8501d31f7b5c1265f72fc7a8b4ce4c Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 22:59:01 +1100 Subject: [PATCH] Remove Win32 player ID types from in-game info menu --- .../Platform/Common/UI/UIScene_InGameInfoMenu.cpp | 10 +++++----- .../Platform/Common/UI/UIScene_InGameInfoMenu.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp index 48e860289..e1f37f1fb 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp @@ -20,10 +20,10 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer m_playerNames[i] = L""; } - DWORD playerCount = g_NetworkManager.GetPlayerCount(); + int playerCount = g_NetworkManager.GetPlayerCount(); m_playersCount = 0; - for(DWORD i = 0; i < playerCount; ++i) + for(int i = 0; i < playerCount; ++i) { INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i ); @@ -196,10 +196,10 @@ void UIScene_InGameInfoMenu::handleGainFocus(bool navBack) void UIScene_InGameInfoMenu::handleReload() { - DWORD playerCount = g_NetworkManager.GetPlayerCount(); + int playerCount = g_NetworkManager.GetPlayerCount(); m_playersCount = 0; - for(DWORD i = 0; i < playerCount; ++i) + for(int i = 0; i < playerCount; ++i) { INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i ); @@ -270,7 +270,7 @@ void UIScene_InGameInfoMenu::tick() { UIScene::tick(); - for(DWORD i = 0; i < m_playersCount; ++i) + for(int i = 0; i < m_playersCount; ++i) { INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i ); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h index 9bed08c6b..74ef27025 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "UIScene.h" class UIScene_InGameInfoMenu : public UIScene @@ -13,7 +15,7 @@ private: bool m_isHostPlayer; int m_playersCount; - BYTE m_players[MINECRAFT_NET_MAX_PLAYERS]; // An array of QNet small-id's + std::uint8_t m_players[MINECRAFT_NET_MAX_PLAYERS]; // An array of QNet small-id's char m_playersVoiceState[MINECRAFT_NET_MAX_PLAYERS]; short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS]; std::wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS];