Minor refactor

This commit is contained in:
MihailRis
2024-01-03 20:42:26 +03:00
parent 0d36f52bdd
commit 2ad115a2a8
9 changed files with 19 additions and 20 deletions
+5 -5
View File
@@ -73,12 +73,10 @@ WorldFiles::WorldFiles(fs::path directory, const DebugSettings& settings)
: directory(directory),
generatorTestMode(settings.generatorTestMode),
doWriteLights(settings.doWriteLights) {
compressionBuffer = new ubyte[CHUNK_DATA_LEN * 2];
compressionBuffer.reset(new ubyte[CHUNK_DATA_LEN * 2]);
}
WorldFiles::~WorldFiles(){
delete[] compressionBuffer;
regions.clear();
}
WorldRegion* WorldFiles::getRegion(regionsmap& regions, int x, int z) {
@@ -98,10 +96,12 @@ WorldRegion* WorldFiles::getOrCreateRegion(regionsmap& regions, int x, int z) {
}
ubyte* WorldFiles::compress(const ubyte* src, size_t srclen, size_t& len) {
len = extrle::encode(src, srclen, compressionBuffer);
ubyte* buffer = this->compressionBuffer.get();
len = extrle::encode(src, srclen, buffer);
ubyte* data = new ubyte[len];
for (size_t i = 0; i < len; i++) {
data[i] = compressionBuffer[i];
data[i] = buffer[i];
}
return data;
}
+1 -1
View File
@@ -107,7 +107,7 @@ public:
regionsmap regions;
regionsmap lights;
std::filesystem::path directory;
ubyte* compressionBuffer;
std::unique_ptr<ubyte[]> compressionBuffer;
bool generatorTestMode;
bool doWriteLights;
+2 -2
View File
@@ -10,7 +10,7 @@
namespace fs = std::filesystem;
files::rafile::rafile(std::filesystem::path filename)
files::rafile::rafile(fs::path filename)
: file(filename, std::ios::binary | std::ios::ate) {
if (!file) {
throw std::runtime_error("could not to open file "+filename.string());
@@ -102,7 +102,7 @@ json::JObject* files::read_json(fs::path file) {
}
}
std::vector<std::string> files::read_list(std::filesystem::path filename) {
std::vector<std::string> files::read_list(fs::path filename) {
std::ifstream file(filename);
if (!file) {
throw std::runtime_error("could not to open file "+filename.u8string());