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

@@ -4,7 +4,7 @@
#include "Game.h"
#include "dCommonDependencies.h"
#include "dLogger.h"
#include "Logger.h"
class LDFTests : public dCommonDependenciesTest {
protected:
@@ -237,7 +237,7 @@ TEST_F(LDFTests, LDFParseEdgeCaseTest) {
"key=Garbage:value", // invalid LDF type
};
for (auto testString : tests) {
Game::logger->Log("LDFTests", "Testing LDF Parsing of invalid string (%s)", testString.c_str());
LOG("Testing LDF Parsing of invalid string (%s)", testString.c_str());
EXPECT_NO_THROW(LDFBaseData::DataFromString(testString));
}
}