Use latest buttoncombo lib

wiiu-env · Jan 26, 2025 · 3133b78 · 3133b78
1 parent b167bb5
commit 3133b78
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ghcr.io/wiiu-env/devkitppc:20241128
 
-COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250104-0663ede /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250125-cb22627 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20241012 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
 

diff --git a/source/ButtonComboInfoDown.cpp b/source/ButtonComboInfoDown.cpp
@@ -54,7 +54,7 @@ ButtonComboModule_Error ButtonComboInfoDown::setHoldDuration(uint32_t) {
 }
 
 ButtonComboModule_ButtonComboInfoEx ButtonComboInfoDown::getComboInfoEx() const {
-    return {.type               = mIsObserver ? BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN_OBSERVER : BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN,
+    return {.type               = mIsObserver ? BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN_OBSERVER : BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN,
             .basicCombo         = {.controllerMask = mControllerMask, .combo = mCombo},
             .optionalHoldForXMs = 0};
 }

diff --git a/source/ButtonComboInfoHold.cpp b/source/ButtonComboInfoHold.cpp
@@ -72,7 +72,7 @@ ButtonComboModule_Error ButtonComboInfoHold::setHoldDuration(const uint32_t hold
 }
 
 ButtonComboModule_ButtonComboInfoEx ButtonComboInfoHold::getComboInfoEx() const {
-    return {.type               = mIsObserver ? BUTTON_COMBO_MODULE_TYPE_HOLD_OBSERVER : BUTTON_COMBO_MODULE_TYPE_HOLD,
+    return {.type               = mIsObserver ? BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD_OBSERVER : BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD,
             .basicCombo         = {.controllerMask = mControllerMask, .combo = mCombo},
             .optionalHoldForXMs = mTargetDurationInMs};
 }

diff --git a/source/ButtonComboManager.cpp b/source/ButtonComboManager.cpp
@@ -300,10 +300,10 @@ std::optional<std::shared_ptr<ButtonComboInfoIF>> ButtonComboManager::CreateComb
 
     bool observer = false;
     switch (options.buttonComboOptions.type) {
-        case BUTTON_COMBO_MODULE_TYPE_HOLD_OBSERVER:
+        case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD_OBSERVER:
             observer = true;
             __attribute__((fallthrough));
-        case BUTTON_COMBO_MODULE_TYPE_HOLD: {
+        case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD: {
             if (options.buttonComboOptions.optionalHoldForXMs == 0) {
                 err = BUTTON_COMBO_MODULE_ERROR_DURATION_MISSING;
                 return std::nullopt;
@@ -317,10 +317,10 @@ std::optional<std::shared_ptr<ButtonComboInfoIF>> ButtonComboManager::CreateComb
                                                          options.callbackOptions.context,
                                                          observer);
         }
-        case BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN_OBSERVER:
+        case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN_OBSERVER:
             observer = true;
             __attribute__((fallthrough));
-        case BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN: {
+        case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN: {
             err = BUTTON_COMBO_MODULE_ERROR_SUCCESS;
             return std::make_shared<ButtonComboInfoDown>(options.metaOptions.label,
                                                          options.buttonComboOptions.basicCombo.controllerMask,
@@ -329,7 +329,7 @@ std::optional<std::shared_ptr<ButtonComboInfoIF>> ButtonComboManager::CreateComb
                                                          options.callbackOptions.context,
                                                          observer);
         }
-        case BUTTON_COMBO_MODULE_TYPE_INVALID:
+        case BUTTON_COMBO_MODULE_COMBO_TYPE_INVALID:
             break;
     }
     err = BUTTON_COMBO_MODULE_ERROR_INVALID_COMBO_TYPE;