Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-15 11:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main into property-entrance-rewrite

Browse Source
This commit is contained in:
Jettford
2023-10-28 01:09:03 +01:00
parent 758bf8becf
commit 6df16ab406
220 changed files with 1451 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dNet/dServer.h
View File

@@ -4,7 +4,7 @@
#include "ReplicaManager.h"
#include "NetworkIDManager.h"
class dLogger;
class Logger;
class dConfig;
enum class eServerDisconnectIdentifiers : uint32_t;
@@ -26,7 +26,7 @@ public:
int maxConnections,
bool isInternal,
bool useEncryption,
dLogger* logger,
Logger* logger,
const std::string masterIP,
int masterPort,
ServerType serverType,
@@ -51,7 +51,7 @@ public:
const bool GetIsEncrypted() const { return mUseEncryption; }
const bool GetIsInternal() const { return mIsInternal; }
const bool GetIsOkay() const { return mIsOkay; }
dLogger* GetLogger() const { return mLogger; }
Logger* GetLogger() const { return mLogger; }
const bool GetIsConnectedToMaster() const { return mMasterConnectionActive; }
const unsigned int GetZoneID() const { return mZoneID; }
const int GetInstanceID() const { return mInstanceID; }
@@ -74,7 +74,7 @@ private:
bool ConnectToMaster();
private:
dLogger* mLogger = nullptr;
Logger* mLogger = nullptr;
dConfig* mConfig = nullptr;
RakPeerInterface* mPeer = nullptr;
ReplicaManager* mReplicaManager = nullptr;