backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

start work on swapping PlatformNetworkManagerStub for PlatformNetwork

Browse source
This commit is contained in:
Tropical 2026-04-09 10:05:35 -05:00
parent 9c1c1695a7
commit d3a9de8b2a
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
targets/app/common/Network/GameNetworkManager.cpp
View file

@ -13,7 +13,6 @@
#include "minecraft/network/Socket.h" #include "minecraft/network/Socket.h"
#include "app/common/Game.h" #include "app/common/Game.h"
#include "app/common/GameRules/GameRuleManager.h" #include "app/common/GameRules/GameRuleManager.h"
#include "app/common/Network/PlatformNetworkManagerStub.h"
#include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
@ -54,6 +53,7 @@
#include "platform/storage/storage.h" #include "platform/storage/storage.h"
#include "strings.h" #include "strings.h"
#include "util/StringHelpers.h" #include "util/StringHelpers.h"
#include "platform/network/network.h"
class FriendSessionInfo; class FriendSessionInfo;
class INVITE_INFO; class INVITE_INFO;
@ -86,7 +86,7 @@ void CGameNetworkManager::Initialise() {
LevelRenderer::getGlobalChunkCount() / LevelRenderer::getGlobalChunkCount() /
(Level::maxBuildHeight / (Level::maxBuildHeight /
16); // dividing here by number of renderer chunks in one column 16); // dividing here by number of renderer chunks in one column
s_pPlatformNetworkManager = new IPlatformNetworkStub(); s_pPlatformNetworkManager = &PlatformNetwork;
s_pPlatformNetworkManager->Initialise(this, flagIndexSize); s_pPlatformNetworkManager->Initialise(this, flagIndexSize);
m_bNetworkThreadRunning = false; m_bNetworkThreadRunning = false;
m_bInitialised = true; m_bInitialised = true;

3
targets/app/common/Network/GameNetworkManager.h
View file

@ -7,7 +7,6 @@
#if !defined(__linux__) #if !defined(__linux__)
#include <qnet.h> #include <qnet.h>
#endif #endif
#include "PlatformNetworkManagerStub.h"
#include "platform/network/IPlatformNetwork.h" #include "platform/network/IPlatformNetwork.h"
#include "minecraft/network/INetworkService.h" #include "minecraft/network/INetworkService.h"
#include "minecraft/network/platform/NetworkPlayerInterface.h" #include "minecraft/network/platform/NetworkPlayerInterface.h"
@ -29,8 +28,6 @@ class INetworkPlayer;
// implementation of PlatformNetworkManager to provide this functionality. // implementation of PlatformNetworkManager to provide this functionality.
class CGameNetworkManager : public ::minecraft::network::INetworkService { class CGameNetworkManager : public ::minecraft::network::INetworkService {
friend class IPlatformNetworkStub;
public: public:
CGameNetworkManager(); CGameNetworkManager();
// Misc high level flow // Misc high level flow

1
targets/app/common_sources.txt
View file

@ -51,7 +51,6 @@ common/LocalizationManager.cpp
common/MenuController.cpp common/MenuController.cpp
common/Network/GameNetworkManager.cpp common/Network/GameNetworkManager.cpp
common/Network/NetworkPlayerQNet.cpp common/Network/NetworkPlayerQNet.cpp
common/Network/PlatformNetworkManagerStub.cpp
common/Network/QNetStubs.cpp common/Network/QNetStubs.cpp
common/NetworkController.cpp common/NetworkController.cpp
common/SaveManager.cpp common/SaveManager.cpp