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

@@ -1,7 +1,7 @@
#include "PacketUtils.h"
#include <vector>
#include <fstream>
#include "dLogger.h"
#include "Logger.h"
#include "Game.h"
uint16_t PacketUtils::ReadU16(uint32_t startLoc, Packet* packet) {
@@ -62,7 +62,7 @@ std::string PacketUtils::ReadString(uint32_t startLoc, Packet* packet, bool wide
//! Saves a packet to the filesystem
void PacketUtils::SavePacket(const std::string& filename, const char* data, size_t length) {
//If we don't log to the console, don't save the bin files either. This takes up a lot of time.
if (!Game::logger->GetIsLoggingToConsole()) return;
if (!Game::logger->GetLogToConsole()) return;
std::string path = "packets/" + filename;