voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 13:31:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix compiler warnings (GCC + Clang)

Browse source
This commit is contained in:
MihailRis 2025-03-20 22:04:29 +03:00
parent 6c3d2d0907
commit 3d22de761f
50 changed files with 80 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/world/files/WorldConverter.cpp
View file

@ -54,7 +54,6 @@ void WorldConverter::addRegionsTasks(
}
void WorldConverter::createUpgradeTasks() {
const auto& regions = wfile->getRegions();
for (auto& issue : report->getIssues()) {
if (issue.issueType != ContentIssueType::REGION_FORMAT_UPDATE) {
continue;
@ -83,7 +82,6 @@ void WorldConverter::createConvertTasks() {
}
};
const auto& regions = wfile->getRegions();
for (auto& issue : report->getIssues()) {
switch (issue.issueType) {
case ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE:
@ -97,13 +95,13 @@ void WorldConverter::createConvertTasks() {
}
}
tasks.push(ConvertTask {ConvertTaskType::PLAYER, wfile->getPlayerFile()});
tasks.push(ConvertTask {
ConvertTaskType::PLAYER, wfile->getPlayerFile(), 0, 0, {}});
}
void WorldConverter::createBlockFieldsConvertTasks() {
// blocks data conversion requires correct block indices
// so it must be done AFTER voxels conversion
const auto& regions = wfile->getRegions();
for (auto& issue : report->getIssues()) {
switch (issue.issueType) {
case ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE:

3
src/world/files/compatibility.cpp
View file

@ -43,7 +43,7 @@ util::Buffer<ubyte> compatibility::convert_region_2to3(
const util::Buffer<ubyte>& src, RegionLayerIndex layer
) {
const size_t REGION_CHUNKS = 1024;
const size_t HEADER_SIZE = 10;
// const size_t HEADER_SIZE = 10;
const size_t OFFSET_TABLE_SIZE = REGION_CHUNKS * sizeof(uint32_t);
const ubyte COMPRESS_NONE = 0;
const ubyte COMPRESS_EXTRLE8 = 1;
@ -61,7 +61,6 @@ util::Buffer<ubyte> compatibility::convert_region_2to3(
}
uint32_t offsets[REGION_CHUNKS] {};
size_t chunkIndex = 0;
auto tablePtr = reinterpret_cast<const uint32_t*>(
ptr + src.size() - OFFSET_TABLE_SIZE