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

Implement GTest and change windows output path

Browse Source 
Implement GTest as a testing infrastructure.
Make windows output binaries to the build folder instead of the release type folder (potentially issue further down the line)
Add a simple unit test for DestroyableComponent
This commit is contained in:
David Markowitz
2022-11-07 00:12:35 -08:00
committed by GitHub
parent 9c58ea5c41
commit 1464762bcd
30 changed files with 763 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dNet/dServer.cpp
View File

@@ -50,7 +50,6 @@ dServer::dServer(const std::string& ip, int port, int instanceID, int maxConnect
mNetIDManager = nullptr;
mReplicaManager = nullptr;
mServerType = serverType;
//Attempt to start our server here:
mIsOkay = Startup();
@@ -193,7 +192,10 @@ bool dServer::Startup() {
}
void dServer::Shutdown() {
mPeer->Shutdown(1000);
if (mPeer) {
mPeer->Shutdown(1000);
RakNetworkFactory::DestroyRakPeerInterface(mPeer);
}
if (mNetIDManager) {
delete mNetIDManager;
@@ -205,10 +207,9 @@ void dServer::Shutdown() {
mReplicaManager = nullptr;
}
//RakNetworkFactory::DestroyRakPeerInterface(mPeer); //Not needed, we already called Shutdown ourselves.
if (mServerType != ServerType::Master) {
if (mServerType != ServerType::Master && mMasterPeer) {
mMasterPeer->Shutdown(1000);
//RakNetworkFactory::DestroyRakPeerInterface(mMasterPeer);
RakNetworkFactory::DestroyRakPeerInterface(mMasterPeer);
}
}