backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-13 15:22:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove remaining primitive locals from system helpers

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-14 06:54:39 +11:00
parent a2ddb7c2f0
commit 3e7a72c9d3
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.cpp
View file

@ -712,7 +712,7 @@ bool CPlatformNetworkManagerSony::LeaveGame(bool bMigrateHost)
if( socket != NULL ) if( socket != NULL )
{ {
//printf("Waiting for socket closed event\n"); //printf("Waiting for socket closed event\n");
DWORD result = socket->m_socketClosedEvent->WaitForSignal(INFINITE); socket->m_socketClosedEvent->WaitForSignal(INFINITE);
// The session might be gone once the socket releases // The session might be gone once the socket releases
if( IsInSession() ) if( IsInSession() )
@ -1185,9 +1185,9 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
if( m_currentSearchResultsCount[iPad] > 0 ) if( m_currentSearchResultsCount[iPad] > 0 )
{ {
// Loop through all the results. // Loop through all the results.
for( DWORD dwResult = 0; dwResult < m_currentSearchResultsCount[iPad]; dwResult++ ) for( int resultIndex = 0; resultIndex < m_currentSearchResultsCount[iPad]; ++resultIndex )
{ {
pSearchResult = &m_pCurrentSearchResults[iPad]->pResults[dwResult]; pSearchResult = &m_pCurrentSearchResults[iPad]->pResults[resultIndex];
if(memcmp( &pSearchResult->info.sessionID, &sessionId, sizeof(SessionID) ) != 0) continue; if(memcmp( &pSearchResult->info.sessionID, &sessionId, sizeof(SessionID) ) != 0) continue;
@ -1211,7 +1211,7 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
if(!foundSession) break; if(!foundSession) break;
// See if this result was contacted successfully via QoS probes. // See if this result was contacted successfully via QoS probes.
pxnqi = &m_pCurrentQoSResult[iPad]->axnqosinfo[dwResult]; pxnqi = &m_pCurrentQoSResult[iPad]->axnqosinfo[resultIndex];
if( pxnqi->bFlags & XNET_XNQOSINFO_TARGET_CONTACTED ) if( pxnqi->bFlags & XNET_XNQOSINFO_TARGET_CONTACTED )
{ {

5
Minecraft.World/Platform/System.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <cstdint>
#include "../Util/ArrayWithLength.h" #include "../Util/ArrayWithLength.h"
@ -35,5 +36,5 @@ public:
}; };
#define MAKE_FOURCC(ch0, ch1, ch2, ch3) \ #define MAKE_FOURCC(ch0, ch1, ch2, ch3) \
((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch0)) | (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch1)) << 8) | \
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch2)) << 16) | (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch3)) << 24))