From 5c0788f31f3cc0bf036b40061bf6de997c14b71c Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Mon, 21 Apr 2025 19:53:15 +0000 Subject: [PATCH] format, skip miniaudio/dr_libs when formatting --- run-clang-format.ps1 | 3 ++- run-clang-format.sh | 2 +- .../accessible-actors/AccessibleActorList.cpp | 13 ++++++------- .../accessible-actors/ActorAccessibility.cpp | 5 +++-- .../Enhancements/accessible-actors/SfxExtractor.cpp | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/run-clang-format.ps1 b/run-clang-format.ps1 index 39905f9ed..48de552a5 100644 --- a/run-clang-format.ps1 +++ b/run-clang-format.ps1 @@ -36,7 +36,8 @@ if (-not (Test-Path $clangFormatFilePath) -or ($currentVersion -ne $requiredVers $basePath = (Resolve-Path .).Path $files = Get-ChildItem -Path $basePath\soh -Recurse -File ` - | Where-Object { ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or ` + | Where-Object { (-not ($_.FullName -like "*\soh\include\miniaudio*")) -and (-not ($_.FullName -like "*\soh\include\dr_libs\*")) -and ` + ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or ` (($_.Extension -eq '.h' -or $_.Extension -eq '.hpp') -and ` (-not ($_.FullName -like "*\soh\src\*" -or $_.FullName -like "*\soh\include\*")))) -and ` (-not ($_.FullName -like "*\soh\assets\*")) } diff --git a/run-clang-format.sh b/run-clang-format.sh index 20129e63d..7b8abec06 100755 --- a/run-clang-format.sh +++ b/run-clang-format.sh @@ -26,4 +26,4 @@ # and pass it as an argument to clang-format # verbose to print files being formatted and X out of Y status -find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose +find soh -type f \( ! -path "soh/include/miniaudio/*" -a ! -path "soh/include/dr_libs/*" -a \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" \) \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose diff --git a/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp b/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp index 64eab6409..1ba6a11db 100644 --- a/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp +++ b/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp @@ -165,8 +165,7 @@ void accessible_hasi(AccessibleActor* actor) { actor->policy.ydist = 1000; actor->policy.distance = 1000; ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EN_OCTAROCK_ROCK, false); - } - else if ((actor->actor->params) == 1) { + } else if ((actor->actor->params) == 1) { actor->policy.ydist = 1000; ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_PL_DAMAGE, false); } @@ -558,7 +557,6 @@ void accessible_jabu_elevator(AccessibleActor* actor) { } } - void accessible_graveyard_soil(AccessibleActor* actor) { ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_IT_WOODSTICK_BROKEN, false); } @@ -979,8 +977,7 @@ void ActorAccessibility_InitActors() { ActorAccessibility_AddSupportedActor(VA_AUDIO_COMPASS, policy); // Now query a list of virtual actors for a given location (scene and room number). - VirtualActorList* list = - (VirtualActorList*)ActorAccessibility_GetVirtualActorList(EVERYWHERE, 0); + VirtualActorList* list = (VirtualActorList*)ActorAccessibility_GetVirtualActorList(EVERYWHERE, 0); // Now place the actor. ActorAccessibility_AddVirtualActor(list, VA_GENERAL_HELPER, { { 0.0, 0.0, 0.0 }, { 0, 0, 0 } }); @@ -991,7 +988,8 @@ void ActorAccessibility_InitActors() { ActorAccessibility_AddVirtualActor(list, VA_CRAWLSPACE, { { -784.0, 120.0, 1046.00 }, { 0, 14702, 0 } }); ActorAccessibility_AddVirtualActor(list, VA_MARKER, { { 2146.5, 1.0, -142.8 } }); - list = ActorAccessibility_GetVirtualActorList(SCENE_KOKIRI_FOREST, 2); // Kokiri Forest Room with boulder and kokiri sword + list = ActorAccessibility_GetVirtualActorList(SCENE_KOKIRI_FOREST, + 2); // Kokiri Forest Room with boulder and kokiri sword ActorAccessibility_AddVirtualActor(list, VA_CRAWLSPACE, { { -788.0, 120.0, 1392.00 }, { 0, 14702, 0 } }); list = ActorAccessibility_GetVirtualActorList(SCENE_DEKU_TREE, 2); // deku tree slingshot room @@ -1009,7 +1007,8 @@ void ActorAccessibility_InitActors() { ActorAccessibility_AddVirtualActor(list, VA_MARKER, { { -1958, 20, -1297 } }); list = ActorAccessibility_GetVirtualActorList(SCENE_JABU_JABU, 2); - AccessibleActor* temp = ActorAccessibility_AddVirtualActor(list, VA_MARKER, { { -260, -400, -3377 } }); // green tentacle hole + AccessibleActor* temp = + ActorAccessibility_AddVirtualActor(list, VA_MARKER, { { -260, -400, -3377 } }); // green tentacle hole temp->policy.distance = 200; temp->policy.sound = NA_SE_EN_DAIOCTA_DEAD; temp = ActorAccessibility_AddVirtualActor(list, VA_MARKER, { { 230, -400, -3211 } }); // ruto hole diff --git a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp index c6bb99bd9..e7eb2f8d5 100644 --- a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp +++ b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp @@ -371,7 +371,8 @@ void ActorAccessibility_RunAccessibilityForActor(PlayState* play, AccessibleActo if (!actor->policy.runsAlways && actor->xyzDistToPlayer > actor->policy.distance) { return; } - if (actor->isDrawn == 0 && actor->actor->id != ACTOR_EN_IT && actor->actor->id != ACTOR_EN_OKARINA_TAG && !aa->glossary->GlossaryStarted) + if (actor->isDrawn == 0 && actor->actor->id != ACTOR_EN_IT && actor->actor->id != ACTOR_EN_OKARINA_TAG && + !aa->glossary->GlossaryStarted) return; if (actor->policy.aimAssist.isProvider) { Player* player = GET_PLAYER(play); @@ -388,7 +389,7 @@ void ActorAccessibility_RunAccessibilityForActor(PlayState* play, AccessibleActo ActorAccessibility_PlaySoundForActor(actor, 9, actor->policy.aimAssist.sfx, false); } } else { - // Make sure there's no delay the next time you draw your bow or whatever. + // Make sure there's no delay the next time you draw your bow or whatever. actor->aimAssist.framesSinceAimAssist = 32768; } } diff --git a/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp b/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp index 408165c28..45bd65f7f 100644 --- a/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp +++ b/soh/soh/Enhancements/accessible-actors/SfxExtractor.cpp @@ -172,7 +172,7 @@ void SfxExtractor::finished() { void SfxExtractor::maybeGiveProgressReport() { size_t ripsRemaining = sfxCount - sfxToRip; for (int i = 0; i < 9; i++) { - if (ripsRemaining == sfxCount - ((int)ceil(sfxCount * ((i+1) / 10.0f)))) { + if (ripsRemaining == sfxCount - ((int)ceil(sfxCount * ((i + 1) / 10.0f)))) { int percentDone = (i + 1) * 10; std::stringstream ss; ss << percentDone << " percent complete.";