PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor a bit

Browse Source
This commit is contained in:
A-lex-Ra
2023-12-18 20:48:03 +06:00
parent 667a90b724
commit afedd103e8
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/WorldFiles.cpp
+6 -7
View File
@@ -238,22 +238,18 @@ ubyte* WorldFiles::getData(unordered_map<ivec2, WorldRegion*>& regions,
int localX = x - (regionX * REGION_SIZE);
int localZ = z - (regionZ * REGION_SIZE);
WorldRegion* region = getRegion(regions, regionX, regionZ);
if (region == nullptr) {
region = new WorldRegion();
regions[ivec2(regionX, regionZ)] = region;
}
WorldRegion* region = getOrCreateRegion(regions, regionX, regionZ);
ubyte* data = region->get(localX, localZ);
if (data == nullptr) {
uint32_t size;
data = readChunkData(x, z, size,
folder/getRegionFilename(regionX, regionZ));
if (data) {
if (data != nullptr) {
region->put(localX, localZ, data, size);
}
}
if (data) {
if (data != nullptr) {
return decompress(data, region->getSize(localX, localZ), CHUNK_DATA_LEN);
}
return nullptr;
@@ -291,6 +287,9 @@ ubyte* WorldFiles::readChunkData(int x, int z, uint32_t& length, path filename){
ubyte* data = new ubyte[length];
input.read((char*)data, length);
input.close();
if (data == nullptr) {
std::cerr << "ERROR: failed to read data of chunk x("<< x <<"), z("<< z <<")" << std::endl;
}
return data;
}