diff options
| author | cadmic <cadmic24@gmail.com> | 2024-02-07 08:03:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-07 11:03:55 -0500 |
| commit | bc9c1f2be249026a977d61681e0e9766b52d6b7f (patch) | |
| tree | 9c7dee7ca4b5602c0b1a1716b7f6ae60bcb85de8 /src/code | |
| parent | be4f3142e046486b8f989a040be6a0c7fed2cca3 (diff) | |
Match more code files (#1724)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/audio_thread_manager.c | 2 | ||||
| -rw-r--r-- | src/code/z_fcurve_data_skelanime.c | 2 | ||||
| -rw-r--r-- | src/code/z_map_mark.c | 4 | ||||
| -rw-r--r-- | src/code/z_viszbuf.c | 10 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c index bbec08dea..32c5826a5 100644 --- a/src/code/audio_thread_manager.c +++ b/src/code/audio_thread_manager.c @@ -105,7 +105,7 @@ void AudioMgr_ThreadEntry(void* arg) { IrqMgr_AddClient(audioMgr->irqMgr, &irqClient, &audioMgr->interruptQueue); // Spin waiting for events - while (true) { + for (;;) { osRecvMesg(&audioMgr->interruptQueue, (OSMesg*)&msg, OS_MESG_BLOCK); switch (*msg) { diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 2348fa13a..e4d4b8a77 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -162,6 +162,8 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov OPEN_DISPS(play->state.gfxCtx, "../z_fcurve_data_skelanime.c", 279); + if (1) {} + Matrix_Push(); if ((overrideLimbDraw == NULL) || diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 47d3d2bda..31d9f93ad 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -118,8 +118,8 @@ void MapMark_DrawForDungeon(PlayState* play) { markInfo->textureWidth, markInfo->textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - rectLeft = (GREG(94) + markPoint->x + 204) << 2; - rectTop = (GREG(95) + markPoint->y + 140) << 2; + rectLeft = ((OOT_DEBUG ? GREG(94) : 0) + markPoint->x + 204) << 2; + rectTop = ((OOT_DEBUG ? GREG(95) : 0) + markPoint->y + 140) << 2; gSPTextureRectangle(OVERLAY_DISP++, rectLeft, rectTop, markInfo->rectWidth + rectLeft, rectTop + markInfo->rectHeight, G_TX_RENDERTILE, 0, 0, markInfo->dsdx, markInfo->dtdy); diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c index 90080b79c..3e9f15eb5 100644 --- a/src/code/z_viszbuf.c +++ b/src/code/z_viszbuf.c @@ -47,14 +47,18 @@ extern u16 D_0E000000[]; void VisZBuf_Init(VisZBuf* this) { this->vis.type = VIS_ZBUF_TYPE_IA; this->vis.scissorType = VIS_NO_SETSCISSOR; + this->vis.primColor.r = 255; this->vis.primColor.g = 255; this->vis.primColor.b = 255; this->vis.primColor.a = 255; + + // clang-format off + this->vis.envColor.r = 0; \ + this->vis.envColor.g = 0; \ + this->vis.envColor.b = 0; \ this->vis.envColor.a = 255; - this->vis.envColor.r = 0; - this->vis.envColor.g = 0; - this->vis.envColor.b = 0; + // clang-format on } void VisZBuf_Destroy(VisZBuf* this) { |