From 5a096158838355feee6c0c50af0b1bef969f87f1 Mon Sep 17 00:00:00 2001 From: Joshua Peisach Date: Tue, 6 Oct 2026 08:50:43 -0400 Subject: [PATCH 1/2] Match RPSysPlayerMgr::getSpeakerFlag Co-authored-by: roeming Signed-off-by: Joshua Peisach --- src/Pack/RPSystem/RPSysPlayerMgr.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Pack/RPSystem/RPSysPlayerMgr.cpp b/src/Pack/RPSystem/RPSysPlayerMgr.cpp index a573bf071..754be4646 100644 --- a/src/Pack/RPSystem/RPSysPlayerMgr.cpp +++ b/src/Pack/RPSystem/RPSysPlayerMgr.cpp @@ -47,8 +47,7 @@ u8 RPSysPlayerMgr::getChannel(s32 idx) const { * @param player Player index */ u32 RPSysPlayerMgr::getSpeakerFlag(s32 player) const { - // TODO(kiwi) Uses something from RPSysCoreController - s32 chan = getChannel(player); + s32 chan = (player < 0) ? RPSysCoreController::getActiveController()->getPlayerNo() : getChannel(player); if (chan == WPAD_CHAN0) { return 1 << WPAD_CHAN0; From 6d5795568420203a6ef6523d2dd13221e1ad8c8d Mon Sep 17 00:00:00 2001 From: "Joshua Peisach (ItzSwirlz)" Date: Sun, 18 Oct 2026 12:41:37 -0400 Subject: [PATCH 2/2] drop unnecessary parens Co-authored-by: Kiwi <49212064+kiwi515@users.noreply.github.com> --- src/Pack/RPSystem/RPSysPlayerMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pack/RPSystem/RPSysPlayerMgr.cpp b/src/Pack/RPSystem/RPSysPlayerMgr.cpp index 754be4646..d175c99e3 100644 --- a/src/Pack/RPSystem/RPSysPlayerMgr.cpp +++ b/src/Pack/RPSystem/RPSysPlayerMgr.cpp @@ -47,7 +47,7 @@ u8 RPSysPlayerMgr::getChannel(s32 idx) const { * @param player Player index */ u32 RPSysPlayerMgr::getSpeakerFlag(s32 player) const { - s32 chan = (player < 0) ? RPSysCoreController::getActiveController()->getPlayerNo() : getChannel(player); + s32 chan = player < 0 ? RPSysCoreController::getActiveController()->getPlayerNo() : getChannel(player); if (chan == WPAD_CHAN0) { return 1 << WPAD_CHAN0;