falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve roomproplist code

This commit is contained in:
Ryan Dwyer 2023-05-04 22:33:52 +10:00
parent 09d6ccae49
commit 261be8d702
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/game/prop.c
View File

@ -2786,24 +2786,25 @@ bool propTryAddToChunk(s16 propnum, s32 chunkindex)
s32 roomAllocatePropListChunk(s32 room, s32 prevchunkindex)
{
s32 i;
s32 j;
u32 i;
static u32 nextindex = 0;
for (i = 0; i < 256; i++) {
if (g_RoomPropListChunks[i].count == 0) {
for (j = 0; j < ARRAYCOUNT(g_RoomPropListChunks[i].propnums); j++) {
g_RoomPropListChunks[i].propnums[j] = -1;
}
s32 index = (nextindex + i) % 256;
g_RoomPropListChunks[i].next = -1;
if (g_RoomPropListChunks[index].count == 0) {
g_RoomPropListChunks[index].next = -1;
if (prevchunkindex >= 0) {
g_RoomPropListChunks[prevchunkindex].next = i;
g_RoomPropListChunks[prevchunkindex].next = index;
} else {
g_RoomPropListChunkIndexes[room] = i;
g_RoomPropListChunkIndexes[room] = index;
}
return i;
nextindex = (index + 1) % 256;
return index;
}
}

5
src/game/varsreset.c
View File

@ -61,7 +61,6 @@ void varsReset(void)
void varsResetRoomProps(void)
{
s32 i;
s32 j;
g_RoomPropListChunkIndexes = mempAlloc(ALIGN16(g_Vars.roomcount * sizeof(s16)), MEMPOOL_STAGE);
g_RoomPropListChunks = mempAlloc(256 * sizeof(struct roomproplistchunk), MEMPOOL_STAGE);
@ -73,9 +72,5 @@ void varsResetRoomProps(void)
for (i = 0; i < 256; i++) {
g_RoomPropListChunks[i].count = 0;
g_RoomPropListChunks[i].next = -1;
for (j = 0; j < ARRAYCOUNT(g_RoomPropListChunks[i].propnums); j++) {
g_RoomPropListChunks[i].propnums[j] = -1;
}
}
}