diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2023-07-28 01:48:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 19:48:42 -0400 |
| commit | 5fa018106bde15d414047a38ddac162323739419 (patch) | |
| tree | ba01b82ae2df7c5faebcb9c3e7d47d267b77ccb3 /src/code | |
| parent | 232fdb75d88854d41d6cf0a132e0dd16b69b0f9f (diff) | |
Prefer clang-format-14 (#1517)
* Change preferred clang version to 14 (for formatting)
* Add `--show-paths` arg to format.py for printing paths to clang-* binaries used
* Run formatter (clang-format-14)
* run formatter
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 10 | ||||
| -rw-r--r-- | src/code/z_effect_soft_sprite.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d7cd85e3e..04b8bbd7f 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2815,11 +2815,11 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos overlayEntry->numLoaded = 0; } - actorInit = (void*)(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); } objBankIndex = Object_GetIndex(&play->objectCtx, actorInit->objectId); diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index afd563da2..55a1245a3 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -213,11 +213,11 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) { osSyncPrintf(VT_RST); } - initInfo = (void*)(uintptr_t)( - (overlayEntry->initInfo != NULL) - ? (void*)((uintptr_t)overlayEntry->initInfo - - (intptr_t)((uintptr_t)overlayEntry->vramStart - (uintptr_t)overlayEntry->loadedRamAddr)) - : NULL); + initInfo = (void*)(uintptr_t)((overlayEntry->initInfo != NULL) + ? (void*)((uintptr_t)overlayEntry->initInfo - + (intptr_t)((uintptr_t)overlayEntry->vramStart - + (uintptr_t)overlayEntry->loadedRamAddr)) + : NULL); } if (initInfo->init == NULL) { |