From eb6b837d65ba1c7ca949c19a199c4c83e296ca5f Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Thu, 27 Jul 2023 09:15:40 -0700 Subject: Clang-Format 14 (#1321) * format * Update dockerfile and other documentation * Update mac instructions --- src/code/z_actor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/code/z_actor.c') 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; -- cgit v1.2.3