From 3e25aa58e5958735a68579ceddb8ba6fb55b58a3 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Sat, 14 Mar 2026 06:58:33 +1100 Subject: [PATCH] Remove WinAPI types from XUI teleport --- Minecraft.Client/Platform/Common/XUI/XUI_Teleport.cpp | 6 +++--- Minecraft.Client/Platform/Common/XUI/XUI_Teleport.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.cpp index fc1a5195d..82b082008 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.cpp @@ -44,10 +44,10 @@ HRESULT CScene_Teleport::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad); } - 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 ); @@ -309,4 +309,4 @@ HRESULT CScene_Teleport::OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL& { bHandled=true; return app.AdjustSplitscreenScene_PlayerChanged(m_hObj,&m_OriginalPosition,m_iPad,bJoining); -} \ No newline at end of file +} diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.h b/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.h index 49543af61..a3916723c 100644 --- a/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.h +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.h @@ -1,5 +1,7 @@ #pragma once //using namespace std; +#include + #include "../media/xuiscene_teleportmenu.h" #include "XUI_CustomMessages.h" @@ -60,5 +62,5 @@ 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 };