diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-04-29 21:06:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-29 15:06:08 -0400 |
| commit | 4a6bfcdd21fb2dd6458a3c947b63372e5aa76e19 (patch) | |
| tree | 516b064203d68ecce38f3852cc93fe3646228281 /src/code/z_map_exp.c | |
| parent | 0d7670f05980037814b43507e9707a9bacdd98d8 (diff) | |
Cleanup `clang-format off` (#1195)
* Run formatter
* Remove useless `// clang-format off`
* Improve manual formatting inside `clang-format off` blocks
* Remove `// clang-format off` where used only for code style formatting
* Remove some `// clang-format off` with a for loop "trick"
* Reduce the size of `clang-format off` blocks
* Remove one `clang-format off` by moving assignment to inside line
* Revert "Remove some `// clang-format off` with a for loop "trick""
This reverts commit 30c344b800f22cc45cc30c8c88ce014715cdfed0.
* Put some `// clang-format on` back on the same level as `off`
Diffstat (limited to 'src/code/z_map_exp.c')
| -rw-r--r-- | src/code/z_map_exp.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index b79182f75..b641354b5 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -410,9 +410,13 @@ void Minimap_Draw(GlobalContext* globalCtx) { osSyncPrintf("Game_play_demo_mode_check=%d\n", Gameplay_InCsMode(globalCtx)); // clang-format off if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } else { + Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } // clang-format on R_MINIMAP_DISABLED ^= 1; } @@ -492,9 +496,13 @@ void Minimap_Draw(GlobalContext* globalCtx) { if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_L) && !Gameplay_InCsMode(globalCtx)) { // clang-format off if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } else { + Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gSfxDefaultPos, 4, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultReverb); + } // clang-format on R_MINIMAP_DISABLED ^= 1; } |