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

Merge branch 'main' into AddEntitySerializeTests

Browse Source
This commit is contained in:
David Markowitz
2023-07-15 14:30:37 -07:00
parent 2b1edfa7e5 455f9470a5
commit 0779f33c2e
200 changed files with 861 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/dGameTests/GameDependencies.cpp
View File

@@ -1,13 +1,14 @@
#include "GameDependencies.h"
namespace Game {
dLogger* logger;
dServer* server;
dZoneManager* zoneManager;
dChatFilter* chatFilter;
dConfig* config;
dLogger* logger = nullptr;
dServer* server = nullptr;
dZoneManager* zoneManager = nullptr;
dChatFilter* chatFilter = nullptr;
dConfig* config = nullptr;
std::mt19937 randomEngine;
RakPeerInterface* chatServer;
AssetManager* assetManager;
RakPeerInterface* chatServer = nullptr;
AssetManager* assetManager = nullptr;
SystemAddress chatSysAddr;
EntityManager* entityManager = nullptr;
}

5
tests/dGameTests/GameDependencies.h
View File

@@ -32,11 +32,12 @@ protected:
Game::logger = new dLogger("./testing.log", true, true);
Game::server = new dServerMock();
Game::config = new dConfig("worldconfig.ini");
Game::entityManager = new EntityManager();
}
void TearDownDependencies() {
if (Game::server) delete Game::server;
delete EntityManager::Instance();
if (Game::entityManager) delete Game::entityManager;
if (Game::logger) {
Game::logger->Flush();
delete Game::logger;
@@ -44,7 +45,7 @@ protected:
if (Game::config) delete Game::config;
}
EntityInfo info;
EntityInfo info{};
};
#endif //!__GAMEDEPENDENCIES__H__