mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-27 08:38:06 +00:00
Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup
# Conflicts: # Minecraft.Client/Platform/Common/DLC/DLCManager.cpp # Minecraft.Client/Rendering/Tesselator.cpp
This commit is contained in:
@@ -119,6 +119,8 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
|
||||
m_pGameNetworkManager = pGameNetworkManager;
|
||||
m_flagIndexSize = flagIndexSize;
|
||||
g_pPlatformNetworkManager = this;
|
||||
// 4jcraft added this, as it was never called
|
||||
m_pIQNet = new IQNet();
|
||||
for( int i = 0; i < XUSER_MAX_COUNT; i++ )
|
||||
{
|
||||
playerChangedCallback[ i ] = NULL;
|
||||
@@ -154,6 +156,7 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
|
||||
|
||||
void CPlatformNetworkManagerStub::Terminate()
|
||||
{
|
||||
//TODO: 4jcraft, no release of ressources
|
||||
}
|
||||
|
||||
int CPlatformNetworkManagerStub::GetJoiningReadyPercentage()
|
||||
|
||||
Reference in New Issue
Block a user