The-Homebrew-Cloud/WiiUPluginLoaderBackend
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2025-02-02 22:12:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

ButtonComboAPI: Add support for more wiimote buttons

Browse Source
This commit is contained in:
Maschell 2025-01-04 13:12:20 +01:00
parent c026217390
commit 08489a687d
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,11 +1,11 @@
FROM ghcr.io/wiiu-env/devkitppc:20241128 FROM ghcr.io/wiiu-env/devkitppc:20241128
COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20241231-67b8431 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20250104-1569d27 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libwupsbackend:20240425 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libwupsbackend:20240425 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20241231-a2f949b /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250104-0663ede /artifacts $DEVKITPRO
WORKDIR project WORKDIR project

24
source/plugin/ButtonComboManager.cpp
View File

@ -156,6 +156,18 @@ namespace {
if (other & WUPS_BUTTON_COMBO_BUTTON_RESERVED_BIT) { if (other & WUPS_BUTTON_COMBO_BUTTON_RESERVED_BIT) {
res |= BCMPAD_BUTTON_RESERVED_BIT; res |= BCMPAD_BUTTON_RESERVED_BIT;
} }
if (other & WUPS_BUTTON_COMBO_BUTTON_1) {
res |= BCMPAD_BUTTON_1;
}
if (other & WUPS_BUTTON_COMBO_BUTTON_2) {
res |= BCMPAD_BUTTON_2;
}
if (other & WUPS_BUTTON_COMBO_BUTTON_C) {
res |= BCMPAD_BUTTON_C;
}
if (other & WUPS_BUTTON_COMBO_BUTTON_Z) {
res |= BCMPAD_BUTTON_Z;
}
return static_cast<ButtonComboModule_Buttons>(res); return static_cast<ButtonComboModule_Buttons>(res);
} }
@ -215,6 +227,18 @@ namespace {
if (other & BCMPAD_BUTTON_RESERVED_BIT) { if (other & BCMPAD_BUTTON_RESERVED_BIT) {
res |= WUPS_BUTTON_COMBO_BUTTON_RESERVED_BIT; res |= WUPS_BUTTON_COMBO_BUTTON_RESERVED_BIT;
} }
if (other & BCMPAD_BUTTON_1) {
res |= WUPS_BUTTON_COMBO_BUTTON_1;
}
if (other & BCMPAD_BUTTON_2) {
res |= WUPS_BUTTON_COMBO_BUTTON_2;
}
if (other & BCMPAD_BUTTON_C) {
res |= WUPS_BUTTON_COMBO_BUTTON_C;
}
if (other & BCMPAD_BUTTON_Z) {
res |= WUPS_BUTTON_COMBO_BUTTON_Z;
}
return static_cast<WUPSButtonCombo_Buttons>(res); return static_cast<WUPSButtonCombo_Buttons>(res);
} }