print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Surfaces not able to be placed at the beginning of a partition (#805)

Browse Source 
* Bugfix: Surfaces not able to be placed at the beginning of a partition

* Replace clear_spacial_partition calls with a bzero
This commit is contained in:
Gregory Heskett
2024-07-01 21:48:26 -04:00
committed by GitHub
parent 6a3e7e7a87
commit 7381e35db4
1 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/engine/surface_load.c
View File

@@ -87,30 +87,6 @@ static struct Surface *alloc_surface(u32 dynamic) {
return surface;
}
/**
* Iterates through the entire partition, clearing the surfaces.
*/
static void clear_spatial_partition(SpatialPartitionCell *cells) {
register s32 i = sqr(NUM_CELLS);
while (i--) {
(*cells)[SPATIAL_PARTITION_FLOORS] = NULL;
(*cells)[SPATIAL_PARTITION_CEILS] = NULL;
(*cells)[SPATIAL_PARTITION_WALLS] = NULL;
(*cells)[SPATIAL_PARTITION_WATER] = NULL;
cells++;
}
}
/**
* Clears the static (level) surface partitions for new use.
*/
static void clear_static_surfaces(void) {
gTotalStaticSurfaceData = 0;
clear_spatial_partition(&gStaticSurfacePartition[0][0]);
}
/**
* Add a surface to the correct cell list of surfaces.
* @param dynamic Determines whether the surface is static or dynamic
@@ -164,6 +140,14 @@ static void add_surface_to_cell(s32 dynamic, s32 cellX, s32 cellZ, struct Surfac
struct SurfaceNode *curNode = *list;
// Check if surface should be placed at the beginning of the list.
priority = curNode->surface->upperY * sortDir;
if (surfacePriority > priority) {
*list = newNode;
newNode->next = curNode;
return;
}
// Loop until we find the appropriate place for the surface in the list.
while (curNode->next != NULL) {
priority = curNode->next->surface->upperY * sortDir;
@@ -504,7 +488,9 @@ void load_area_terrain(s32 index, TerrainData *data, RoomData *surfaceRooms, s16
sNumCellsUsed = 0;
sClearAllCells = TRUE;
clear_static_surfaces();
// Clear the static (level) surface partitions for new use.
bzero(gStaticSurfacePartition, sizeof(gStaticSurfacePartition));
gTotalStaticSurfaceData = 0;
// Initialise a new surface pool for this block of static surface data
gCurrStaticSurfacePool = main_pool_alloc(main_pool_available() - 0x10, MEMORY_POOL_LEFT);
@@ -567,7 +553,7 @@ void clear_dynamic_surfaces(void) {
gSurfaceNodesAllocated = gNumStaticSurfaceNodes;
gDynamicSurfacePoolEnd = gDynamicSurfacePool;
if (sClearAllCells) {
clear_spatial_partition(&gDynamicSurfacePartition[0][0]);
bzero(gDynamicSurfacePartition, sizeof(gDynamicSurfacePartition));
} else {
for (u32 i = 0; i < sNumCellsUsed; i++) {
gDynamicSurfacePartition[sCellsUsed[i].z][sCellsUsed[i].x][sCellsUsed[i].partition] = NULL;