diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-07-27 09:15:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 12:15:40 -0400 |
| commit | eb6b837d65ba1c7ca949c19a199c4c83e296ca5f (patch) | |
| tree | a7d091f20f31764fe347014bcf1b8ebbcb453f22 /src/code/z_actor.c | |
| parent | 9e85f5545a290c0bc113ba9b8a12bb7c56130e59 (diff) | |
Clang-Format 14 (#1321)
* format
* Update dockerfile and other documentation
* Update mac instructions
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 0d72410ad..a85c2f31b 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3190,11 +3190,11 @@ ActorInit* Actor_LoadOverlay(ActorContext* actorCtx, s16 index) { overlayEntry->numLoaded = 0; } - actorInit = (uintptr_t)( - (overlayEntry->initInfo != NULL) - ? (void*)((uintptr_t)overlayEntry->initInfo - - (intptr_t)((uintptr_t)overlayEntry->vramStart - (uintptr_t)overlayEntry->loadedRamAddr)) - : NULL); + actorInit = (void*)(uintptr_t)((overlayEntry->initInfo != NULL) + ? (void*)((uintptr_t)overlayEntry->initInfo - + (intptr_t)((uintptr_t)overlayEntry->vramStart - + (uintptr_t)overlayEntry->loadedRamAddr)) + : NULL); } return actorInit; |