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

14
Minecraft.Client/Orbis/Network/SonyVoiceChat_Orbis.cpp
View File

@@ -67,7 +67,7 @@ void LoadPCMVoiceData()
{
char filename[64];
sprintf(filename, "voice%d.pcm", i+1);
HANDLE file = CreateFile(filename, GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
HANDLE file = CreateFile(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
DWORD dwHigh=0;
g_loadedPCMVoiceDataSizes[i] = GetFileSize(file,&dwHigh);
@@ -75,7 +75,7 @@ void LoadPCMVoiceData()
{
g_loadedPCMVoiceData[i] = new char[g_loadedPCMVoiceDataSizes[i]];
DWORD bytesRead;
BOOL bSuccess = ReadFile(file, g_loadedPCMVoiceData[i], g_loadedPCMVoiceDataSizes[i], &bytesRead, nullptr);
BOOL bSuccess = ReadFile(file, g_loadedPCMVoiceData[i], g_loadedPCMVoiceDataSizes[i], &bytesRead, NULL);
assert(bSuccess);
}
g_loadedPCMVoiceDataPos[i] = 0;
@@ -274,7 +274,7 @@ void SQRVoiceConnection::readRemoteData()
if( dataSize > 0 )
{
VoicePacket packet;
int bytesRead = sceRudpRead( m_rudpCtx, &packet, dataSize, 0, nullptr );
int bytesRead = sceRudpRead( m_rudpCtx, &packet, dataSize, 0, NULL );
unsigned int writeSize;
if( bytesRead > 0 )
{
@@ -468,7 +468,7 @@ void SonyVoiceChat_Orbis::sendAllVoiceData()
if(m_localVoiceDevices[i].isValid())
{
bool bChatRestricted = false;
ProfileManager.GetChatAndContentRestrictions(i,true,&bChatRestricted,nullptr,nullptr);
ProfileManager.GetChatAndContentRestrictions(i,true,&bChatRestricted,NULL,NULL);
if(bChatRestricted)
{
@@ -928,7 +928,7 @@ void SonyVoiceChat_Orbis::initLocalPlayer(int playerIndex)
if(m_localVoiceDevices[playerIndex].isValid() == false)
{
bool chatRestricted = false;
ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
// create all device ports required
m_localVoiceDevices[playerIndex].init(ProfileManager.getUserID(playerIndex), chatRestricted);
@@ -965,7 +965,7 @@ SQRVoiceConnection* SonyVoiceChat_Orbis::GetVoiceConnectionFromRudpCtx( int Rudp
if(m_remoteConnections[i]->m_rudpCtx == RudpCtx)
return m_remoteConnections[i];
}
return nullptr;
return NULL;
}
void SonyVoiceChat_Orbis::connectPlayerToAll( int playerIndex )
@@ -990,7 +990,7 @@ SQRVoiceConnection* SonyVoiceChat_Orbis::getVoiceConnectionFromRoomMemberID( Sce
}
}
return nullptr;
return NULL;
}
void SonyVoiceChat_Orbis::disconnectLocalPlayer( int localIdx )