diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-03-07 20:44:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 23:44:18 -0500 |
| commit | c917880261a9144ae4563ef175a536d38a2008d9 (patch) | |
| tree | 34b62fe4b9c77607719c7ad1bf5be1dd286e4fd9 /src/code/graph.c | |
| parent | d7af72273de2f861124d9f442bcb1a6aaf3710e8 (diff) | |
Misc cleanup 13 (#1189)
* FaultAddrConv Functions
* Invisible Ruppe macros
* skybox
* Z64 header defines
* ActorId
* remove i from KaleidoManager_FaultAddrConv
* size_t and parens
Diffstat (limited to 'src/code/graph.c')
| -rw-r--r-- | src/code/graph.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index be865ee61..4bf322878 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -90,21 +90,21 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) { return NULL; } -void* Graph_FaultAddrConvFunc(void* address, void* param) { +void* Graph_FaultAddrConv(void* address, void* param) { uintptr_t addr = address; GameStateOverlay* gameStateOvl = &gGameStateOverlayTable[0]; - uintptr_t ramConv; + size_t ramConv; void* ramStart; - uintptr_t diff; + size_t diff; s32 i; - for (i = 0; i < graphNumGameStates; i++, gameStateOvl++) { + for (i = 0; i < gGraphNumGameStates; i++, gameStateOvl++) { diff = VRAM_PTR_SIZE(gameStateOvl); ramStart = gameStateOvl->loadedRamAddr; ramConv = (uintptr_t)gameStateOvl->vramStart - (uintptr_t)ramStart; if (ramStart != NULL) { - if (addr >= (uintptr_t)ramStart && addr < (uintptr_t)ramStart + diff) { + if ((addr >= (uintptr_t)ramStart) && (addr < (uintptr_t)ramStart + diff)) { return addr + ramConv; } } @@ -122,7 +122,7 @@ void Graph_Init(GraphicsContext* gfxCtx) { gfxCtx->yScale = gViConfigYScale; osCreateMesgQueue(&gfxCtx->queue, gfxCtx->msgBuff, ARRAY_COUNT(gfxCtx->msgBuff)); Fault_AddClient(&sGraphFaultClient, Graph_FaultClient, NULL, NULL); - Fault_AddAddrConvClient(&sGraphFaultAddrConvClient, Graph_FaultAddrConvFunc, NULL); + Fault_AddAddrConvClient(&sGraphFaultAddrConvClient, Graph_FaultAddrConv, NULL); } void Graph_Destroy(GraphicsContext* gfxCtx) { |