Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.Client/Common/XUI/XUI_Teleport.cpp
View File

@@ -21,7 +21,7 @@
//----------------------------------------------------------------------------------
HRESULT CScene_Teleport::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
TeleportMenuInitData *initParam = static_cast<TeleportMenuInitData *>(pInitData->pvInitData);
TeleportMenuInitData *initParam = (TeleportMenuInitData *)pInitData->pvInitData;
m_iPad = initParam->iPad;
m_teleportToPlayer = initParam->teleportToPlayer;
@@ -51,7 +51,7 @@ HRESULT CScene_Teleport::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
if( player != nullptr && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
if( player != NULL && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
{
m_players[m_playersCount] = player->GetSmallId();
++m_playersCount;
@@ -125,7 +125,7 @@ HRESULT CScene_Teleport::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pN
void CScene_Teleport::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
{
CScene_Teleport *scene = static_cast<CScene_Teleport *>(callbackParam);
CScene_Teleport *scene = (CScene_Teleport *)callbackParam;
bool playerFound = false;
for(int i = 0; i < scene->m_playersCount; ++i)
@@ -167,7 +167,7 @@ HRESULT CScene_Teleport::OnGetSourceDataText(XUIMessageGetSourceText *pGetSource
if( pGetSourceTextData->iItem < m_playersCount )
{
INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId( m_players[pGetSourceTextData->iItem] );
if( player != nullptr )
if( player != NULL )
{
#ifndef _CONTENT_PACKAGE
if(app.DebugSettingsOn() && (app.GetGameSettingsDebugMask()&(1L<<eDebugSetting_DebugLeaderboards)))
@@ -253,7 +253,7 @@ HRESULT CScene_Teleport::OnGetSourceDataText(XUIMessageGetSourceText *pGetSource
hr=XuiElementGetChildById(hVisual,L"VoiceGroup",&hVoiceIcon);
playFrame = -1;
if(player != nullptr && player->HasVoice() )
if(player != NULL && player->HasVoice() )
{
if( player->IsMutedByLocalUser(m_iPad) )
{