diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2022-06-13 01:24:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 19:24:45 -0400 |
| commit | feadb0d9ee54ecf9db8d8eaea03f5565e2011271 (patch) | |
| tree | 9c5edc44deec6b288719679564c39fade27c0009 /src/code | |
| parent | 4cb1c3345f3134670537682f4ada2c2a5bdc5a13 (diff) | |
Enable more IDO warnings and apply fixes (#1264)
* Update asm-processor and fix includes with EARLY
* Enable more IDO warnings and disable unwanted warning 516
* Fix most new and remaining warnings
* Improve skelanime comment
* Improve asmproc pragma comment
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Add suggested comment for a wrong prototype
* Update asm-processor with the latest fix
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_800F9280.c | 8 | ||||
| -rw-r--r-- | src/code/graph.c | 3 | ||||
| -rw-r--r-- | src/code/sys_cfb.c | 2 | ||||
| -rw-r--r-- | src/code/z_camera.c | 2 | ||||
| -rw-r--r-- | src/code/z_lights.c | 2 | ||||
| -rw-r--r-- | src/code/z_play.c | 2 | ||||
| -rw-r--r-- | src/code/z_skelanime.c | 20 | ||||
| -rw-r--r-- | src/code/z_vr_box.c | 2 |
8 files changed, 23 insertions, 18 deletions
diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c index 075d609aa..b1d28d681 100644 --- a/src/code/code_800F9280.c +++ b/src/code/code_800F9280.c @@ -96,9 +96,10 @@ typedef enum { } SeqCmdType; void Audio_ProcessSeqCmd(u32 cmd) { - s32 pad[2]; + s32 pad; u16 fadeTimer; u16 channelMask; + u32 channelMaskReversed; u16 val; u8 oldSpec; u8 spec; @@ -305,9 +306,10 @@ void Audio_ProcessSeqCmd(u32 cmd) { // stop channels Audio_QueueCmdS8(0x08000000 | _SHIFTL(playerIdx, 16, 8) | 0xFF00, 1); } - if ((channelMask ^ 0xFFFF) != 0) { + channelMaskReversed = channelMask ^ 0xFFFF; + if (channelMaskReversed != 0) { // with channel mask ~channelMask... - Audio_QueueCmdU16(0x90000000 | _SHIFTL(playerIdx, 16, 8), (channelMask ^ 0xFFFF)); + Audio_QueueCmdU16(0x90000000 | _SHIFTL(playerIdx, 16, 8), channelMaskReversed); // unstop channels Audio_QueueCmdS8(0x08000000 | _SHIFTL(playerIdx, 16, 8) | 0xFF00, 0); } diff --git a/src/code/graph.c b/src/code/graph.c index f70663b59..98b1bcaf6 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -31,6 +31,9 @@ void Graph_FaultClient(void) { osViSwapBuffer(nextFb); } +// TODO: merge Gfx and GfxMod to make this function's arguments consistent +void UCodeDisas_Disassemble(UCodeDisas*, Gfx*); + void Graph_DisassembleUCode(Gfx* workBuf) { UCodeDisas disassembler; diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 1d4b5495f..1bd8fa22a 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -36,7 +36,7 @@ void SysCfb_Init(s32 n64dd) { osSyncPrintf("フレームバッファのアドレスは %08x と %08x です\n", sSysCfbFbPtr[0], sSysCfbFbPtr[1]); } -void SysCfb_Reset() { +void SysCfb_Reset(void) { sSysCfbFbPtr[0] = 0; sSysCfbFbPtr[1] = 0; sSysCfbEnd = 0; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 6f9face0d..fe079d91b 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -8142,7 +8142,7 @@ s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera) { return true; } -s32 Camera_GetDbgCamEnabled() { +s32 Camera_GetDbgCamEnabled(void) { return gDbgCamEnabled; } diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 3767e19da..4557b6334 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -161,7 +161,7 @@ void Lights_BindAll(Lights* lights, LightNode* listHead, Vec3f* vec) { } } -LightNode* Lights_FindBufSlot() { +LightNode* Lights_FindBufSlot(void) { LightNode* node; if (sLightsBuffer.numOccupied >= LIGHTS_BUFFER_SIZE) { diff --git a/src/code/z_play.c b/src/code/z_play.c index 196839f70..dd8c42466 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -307,7 +307,7 @@ void Play_Init(GameState* thisx) { if ((gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_SPOT09) && gSaveContext.sceneSetupIndex == 6) { osSyncPrintf("エンディングはじまるよー\n"); // "The ending starts" - ((void (*)())0x81000000)(); + ((void (*)(void))0x81000000)(); osSyncPrintf("出戻り?\n"); // "Return?" } diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index fe19883b2..1398b8a52 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1086,9 +1086,9 @@ void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeade */ void LinkAnimation_SetUpdateFunction(SkelAnime* skelAnime) { if (skelAnime->mode <= ANIMMODE_LOOP_INTERP) { - skelAnime->update = LinkAnimation_Loop; + skelAnime->update.link = LinkAnimation_Loop; } else { - skelAnime->update = LinkAnimation_Once; + skelAnime->update.link = LinkAnimation_Once; } skelAnime->morphWeight = 0.0f; } @@ -1098,7 +1098,7 @@ void LinkAnimation_SetUpdateFunction(SkelAnime* skelAnime) { * finishes. */ s32 LinkAnimation_Update(PlayState* play, SkelAnime* skelAnime) { - return skelAnime->update(play, skelAnime); + return skelAnime->update.link(play, skelAnime); } /** @@ -1201,7 +1201,7 @@ void LinkAnimation_Change(PlayState* play, SkelAnime* skelAnime, LinkAnimationHe SkelAnime_CopyFrameTable(skelAnime, skelAnime->morphTable, skelAnime->jointTable); morphFrames = -morphFrames; } else { - skelAnime->update = LinkAnimation_Morph; + skelAnime->update.link = LinkAnimation_Morph; AnimationContext_SetLoadFrame(play, animation, (s32)startFrame, skelAnime->limbCount, skelAnime->morphTable); } @@ -1463,11 +1463,11 @@ SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skelet */ void SkelAnime_SetUpdate(SkelAnime* skelAnime) { if (skelAnime->mode <= ANIMMODE_LOOP_INTERP) { - skelAnime->update = SkelAnime_LoopFull; + skelAnime->update.normal = SkelAnime_LoopFull; } else if (skelAnime->mode <= ANIMMODE_ONCE_INTERP) { - skelAnime->update = SkelAnime_Once; + skelAnime->update.normal = SkelAnime_Once; } else { - skelAnime->update = SkelAnime_LoopPartial; + skelAnime->update.normal = SkelAnime_LoopPartial; } } @@ -1476,7 +1476,7 @@ void SkelAnime_SetUpdate(SkelAnime* skelAnime) { * finishes. */ s32 SkelAnime_Update(SkelAnime* skelAnime) { - return skelAnime->update(skelAnime); + return skelAnime->update.normal(skelAnime); } /** @@ -1636,10 +1636,10 @@ void Animation_ChangeImpl(SkelAnime* skelAnime, AnimationHeader* animation, f32 morphFrames = -morphFrames; } else { if (taper != ANIMTAPER_NONE) { - skelAnime->update = SkelAnime_MorphTaper; + skelAnime->update.normal = SkelAnime_MorphTaper; skelAnime->taper = taper; } else { - skelAnime->update = SkelAnime_Morph; + skelAnime->update.normal = SkelAnime_Morph; } SkelAnime_GetFrameData(animation, startFrame, skelAnime->limbCount, skelAnime->morphTable); } diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index f8e6d98b8..f7dce0619 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -266,7 +266,7 @@ s32 func_800AE2C0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3 } break; } - skyboxCtx->unk_138 = &skyboxCtx->dListBuf[2 * arg8]; + skyboxCtx->unk_138 = &skyboxCtx->dListBuf[2 * arg8][0]; for (i = 0; i < 0x20; i++) { index = D_8012ADD8[i]; |
