diff options
Diffstat (limited to 'memory.cpp')
-rw-r--r-- | memory.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -50,7 +50,7 @@ Memory_Block_AllocateAddress(memory *Memory, memory_table_list TableName) // IMPORTANT(fox): All block data has to start with a uint8 Occupied variable! static bool32 -Block_Loop(memory *Memory, memory_table_list TableName, uint32 TotalCount, int *HasIncremented, int *CurrentCount, int *Index, void *Extra = NULL) +Block_Loop(memory *Memory, memory_table_list TableName, uint32 TotalCount, int *HasIncremented, int *CurrentCount, int *Index) { for (;;) { if (*CurrentCount == TotalCount) { @@ -60,12 +60,7 @@ Block_Loop(memory *Memory, memory_table_list TableName, uint32 TotalCount, int * *HasIncremented = 0; (*Index)++; } - uint8 *Occupied; - if (!Extra) { - Occupied = (uint8 *)Memory_Block_AddressAtIndex(Memory, TableName, *Index); - } else { - Occupied = (uint8 *)Bezier_Lookup(Memory, (property_channel *)Extra, *Index); - } + uint8 *Occupied = (uint8 *)Memory_Block_AddressAtIndex(Memory, TableName, *Index); if (*Occupied) { *HasIncremented = 1; (*CurrentCount)++; @@ -90,7 +85,7 @@ Block_Loop(memory *Memory, property_channel *Property, uint32 TotalCount, int *H *HasIncremented = 0; (*Index)++; } - uint8 *Occupied = (uint8 *)Bezier_Lookup(Memory, Property, *Index); + uint8 *Occupied = (uint8 *)Bezier_LookupAddress(Memory, Property, *Index); if (*Occupied) { *HasIncremented = 1; (*CurrentCount)++; |