diff --git a/Dockerfile b/Dockerfile index daa40b6..f0ddbf5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM ghcr.io/wiiu-env/devkitppc:20241128 COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20241226-f71cb8c /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20241231-67b8431 /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/libwupsbackend:20240425 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO -COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20241226-12d1594 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20241231-a2f949b /artifacts $DEVKITPRO WORKDIR project diff --git a/source/plugin/ButtonComboManager.cpp b/source/plugin/ButtonComboManager.cpp index cff1b31..2fd206f 100644 --- a/source/plugin/ButtonComboManager.cpp +++ b/source/plugin/ButtonComboManager.cpp @@ -270,7 +270,7 @@ namespace { options.basicCombo.combo = convert(other.basicCombo.combo); options.basicCombo.controllerMask = convert(other.basicCombo.controllerMask); options.type = convertType(other.type); - options.optionalHoldForXFrames = other.optionalHoldForXFrames; + options.optionalHoldForXMs = other.optionalHoldForXMs; return options; } @@ -279,7 +279,7 @@ namespace { options.type = convertType(other.type); options.basicCombo.combo = convert(other.basicCombo.combo); options.basicCombo.controllerMask = convert(other.basicCombo.controllerMask); - options.optionalHoldForXFrames = other.optionalHoldForXFrames; + options.optionalHoldForXMs = other.optionalHoldForXMs; return options; } @@ -408,8 +408,8 @@ public: return res; } - [[nodiscard]] WUPSButtonCombo_Error UpdateHoldDuration(const uint32_t holdDurationInFrames) const { - return convertError(ButtonComboModule_UpdateHoldDuration(mButtonComboHandle, holdDurationInFrames)); + [[nodiscard]] WUPSButtonCombo_Error UpdateHoldDuration(const uint32_t holdDurationInMs) const { + return convertError(ButtonComboModule_UpdateHoldDuration(mButtonComboHandle, holdDurationInMs)); } [[nodiscard]] WUPSButtonCombo_Error GetButtonComboMeta(WUPSButtonCombo_MetaOptionsOut &outOptions) const { @@ -526,9 +526,9 @@ WUPSButtonCombo_Error ButtonComboManager::UpdateButtonCombo(const WUPSButtonComb } WUPSButtonCombo_Error ButtonComboManager::UpdateHoldDuration(const WUPSButtonCombo_ComboHandle handle, - const uint32_t holdDurationInFrames) { + const uint32_t holdDurationInMs) { return ExecuteForWrapper(handle, [&](const ButtonComboWrapper &wrapper) { - return wrapper.UpdateHoldDuration(holdDurationInFrames); + return wrapper.UpdateHoldDuration(holdDurationInMs); }); } diff --git a/source/plugin/ButtonComboManager.h b/source/plugin/ButtonComboManager.h index c3aa319..eee59d1 100644 --- a/source/plugin/ButtonComboManager.h +++ b/source/plugin/ButtonComboManager.h @@ -49,7 +49,7 @@ public: WUPSButtonCombo_ComboStatus &outStatus); WUPSButtonCombo_Error UpdateHoldDuration(WUPSButtonCombo_ComboHandle handle, - uint32_t holdDurationInFrames); + uint32_t holdDurationInMs); WUPSButtonCombo_Error GetButtonComboMeta(WUPSButtonCombo_ComboHandle handle, WUPSButtonCombo_MetaOptionsOut &outOptions); diff --git a/source/utils/buttoncombo/ButtonComboUtils.cpp b/source/utils/buttoncombo/ButtonComboUtils.cpp index 50f8a14..40d1b6c 100644 --- a/source/utils/buttoncombo/ButtonComboUtils.cpp +++ b/source/utils/buttoncombo/ButtonComboUtils.cpp @@ -132,10 +132,10 @@ namespace ButtonComboUtils::API { WUPSButtonCombo_Error UpdateHoldDuration(void *identifier, const WUPSButtonCombo_ComboHandle handle, - const uint32_t holdDurationInFrames) { + const uint32_t holdDurationInMs) { const auto res = ExecuteForIdentifierLocked(identifier, [&](ButtonComboManager &manager) { - return manager.UpdateHoldDuration(handle, holdDurationInFrames); + return manager.UpdateHoldDuration(handle, holdDurationInMs); }); return res; } diff --git a/source/utils/buttoncombo/ButtonComboUtils.h b/source/utils/buttoncombo/ButtonComboUtils.h index c46cb6e..6009590 100644 --- a/source/utils/buttoncombo/ButtonComboUtils.h +++ b/source/utils/buttoncombo/ButtonComboUtils.h @@ -42,7 +42,7 @@ namespace ButtonComboUtils::API { WUPSButtonCombo_Error UpdateHoldDuration(void *identifier, WUPSButtonCombo_ComboHandle handle, - uint32_t holdDurationInFrames); + uint32_t holdDurationInMs); WUPSButtonCombo_Error GetButtonComboMeta(void *identifier, WUPSButtonCombo_ComboHandle handle,