alexander.nutz/barecopper
1
0
Fork 0
forked from EXTERNAL/bareiron
Code Pull Requests Activity

fix fragmentation in block changes array

Browse Source
This commit is contained in:
p2r3
2025-08-28 23:20:28 +03:00
parent 22d8bfc377
commit 1ae481ed3d
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/procedures.c
View File

@@ -325,15 +325,17 @@ void makeBlockChange (short x, uint8_t y, short z, uint8_t block) {
uint8_t is_base_block = block == getTerrainAt(x, y, z, anchor); uint8_t is_base_block = block == getTerrainAt(x, y, z, anchor);
// Look for existing block change entries and replace them // In the block_changes array, 0xFF indicates a missing/restored entry.
// 0xFF indicates a missing/restored entry // We track the position of the first such "gap" for when the operation
// isn't replacing an existing block change.
int first_gap = block_changes_count;
// Prioritize replacing entries with matching coordinates
// This prevents having conflicting entries for one set of coordinates
for (int i = 0; i < block_changes_count; i ++) { for (int i = 0; i < block_changes_count; i ++) {
if (block_changes[i].block == 0xFF && !is_base_block) { if (block_changes[i].block == 0xFF) {
block_changes[i].x = x; if (first_gap == block_changes_count) first_gap = i;
block_changes[i].y = y; continue;
block_changes[i].z = z;
block_changes[i].block = block;
return;
} }
if ( if (
block_changes[i].x == x && block_changes[i].x == x &&
@@ -349,11 +351,15 @@ void makeBlockChange (short x, uint8_t y, short z, uint8_t block) {
// Don't create a new entry if it contains the base terrain block // Don't create a new entry if it contains the base terrain block
if (is_base_block) return; if (is_base_block) return;
block_changes[block_changes_count].x = x; // Fall back to storing the change at the first possible gap
block_changes[block_changes_count].y = y; block_changes[first_gap].x = x;
block_changes[block_changes_count].z = z; block_changes[first_gap].y = y;
block_changes[block_changes_count].block = block; block_changes[first_gap].z = z;
block_changes_count ++; block_changes[first_gap].block = block;
// Extend future search range if we've appended to the end
if (first_gap == block_changes_count) {
block_changes_count ++;
}
} }