From 4306e80068017e880a7044e5df83fbb8472cbc14 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 22:55:45 +1100 Subject: [PATCH] Remove Win32 player ID types from teleport menu --- .../Platform/Common/UI/UIScene_TeleportMenu.cpp | 10 +++++----- .../Platform/Common/UI/UIScene_TeleportMenu.h | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp index 4a5999a1b..6e0620771 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp @@ -34,10 +34,10 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa 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 ); @@ -124,10 +124,10 @@ void UIScene_TeleportMenu::handleGainFocus(bool navBack) void UIScene_TeleportMenu::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 ); @@ -185,7 +185,7 @@ void UIScene_TeleportMenu::tick() { UIScene::tick(); - for(DWORD i = 0; i < m_playersCount; ++i) + for(int i = 0; i < m_playersCount; ++i) { INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId( m_players[i] ); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.h index a608d8248..9cd3cb760 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "UIScene.h" class UIScene_TeleportMenu : public UIScene @@ -12,7 +14,7 @@ private: bool m_teleportToPlayer; 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]; @@ -48,4 +50,4 @@ protected: public: static void OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving); -}; \ No newline at end of file +};