Merge main into property-entrance-rewrite

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

View File

@@ -2,7 +2,7 @@
#define __DCOMMONDEPENDENCIES__H__
#include "Game.h"
#include "dLogger.h"
#include "Logger.h"
#include "dServer.h"
#include "EntityInfo.h"
#include "EntityManager.h"
@@ -12,7 +12,7 @@
class dCommonDependenciesTest : public ::testing::Test {
protected:
void SetUpDependencies() {
Game::logger = new dLogger("./testing.log", true, true);
Game::logger = new Logger("./testing.log", true, true);
}
void TearDownDependencies() {