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

@@ -6,7 +6,7 @@
#include <string>
#include "Game.h"
#include "dLogger.h"
#include "Logger.h"
#include "dConfig.h"
void dpWorld::Initialize(unsigned int zoneID, bool generateNewNavMesh) {
@@ -23,7 +23,7 @@ void dpWorld::Initialize(unsigned int zoneID, bool generateNewNavMesh) {
if (generateNewNavMesh) m_NavMesh = new dNavMesh(zoneID);
Game::logger->Log("dpWorld", "Physics world initialized!");
LOG("Physics world initialized!");
m_ZoneID = zoneID;
}
@@ -42,9 +42,9 @@ void dpWorld::Reload() {
}
}
}
Game::logger->Log("dpWorld", "Successfully reloaded physics world!");
LOG("Successfully reloaded physics world!");
} else {
Game::logger->Log("dpWorld", "No physics world to reload!");
LOG("No physics world to reload!");
}
}