mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-19 06:22:55 +00:00
start work on swapping PlatformNetworkManagerStub for PlatformNetwork
This commit is contained in:
parent
9c1c1695a7
commit
d3a9de8b2a
|
|
@ -13,7 +13,6 @@
|
|||
#include "minecraft/network/Socket.h"
|
||||
#include "app/common/Game.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/UIStructs.h"
|
||||
#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
|
||||
|
|
@ -54,6 +53,7 @@
|
|||
#include "platform/storage/storage.h"
|
||||
#include "strings.h"
|
||||
#include "util/StringHelpers.h"
|
||||
#include "platform/network/network.h"
|
||||
|
||||
class FriendSessionInfo;
|
||||
class INVITE_INFO;
|
||||
|
|
@ -86,7 +86,7 @@ void CGameNetworkManager::Initialise() {
|
|||
LevelRenderer::getGlobalChunkCount() /
|
||||
(Level::maxBuildHeight /
|
||||
16); // dividing here by number of renderer chunks in one column
|
||||
s_pPlatformNetworkManager = new IPlatformNetworkStub();
|
||||
s_pPlatformNetworkManager = &PlatformNetwork;
|
||||
s_pPlatformNetworkManager->Initialise(this, flagIndexSize);
|
||||
m_bNetworkThreadRunning = false;
|
||||
m_bInitialised = true;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
#if !defined(__linux__)
|
||||
#include <qnet.h>
|
||||
#endif
|
||||
#include "PlatformNetworkManagerStub.h"
|
||||
#include "platform/network/IPlatformNetwork.h"
|
||||
#include "minecraft/network/INetworkService.h"
|
||||
#include "minecraft/network/platform/NetworkPlayerInterface.h"
|
||||
|
|
@ -29,8 +28,6 @@ class INetworkPlayer;
|
|||
// implementation of PlatformNetworkManager to provide this functionality.
|
||||
|
||||
class CGameNetworkManager : public ::minecraft::network::INetworkService {
|
||||
friend class IPlatformNetworkStub;
|
||||
|
||||
public:
|
||||
CGameNetworkManager();
|
||||
// Misc high level flow
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ common/LocalizationManager.cpp
|
|||
common/MenuController.cpp
|
||||
common/Network/GameNetworkManager.cpp
|
||||
common/Network/NetworkPlayerQNet.cpp
|
||||
common/Network/PlatformNetworkManagerStub.cpp
|
||||
common/Network/QNetStubs.cpp
|
||||
common/NetworkController.cpp
|
||||
common/SaveManager.cpp
|
||||
|
|
|
|||
Loading…
Reference in a new issue