Fix swap x/o feature

cy33hc · Mar 28, 2021 · b8c92a8 · b8c92a8
1 parent cda6bd7
commit b8c92a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ include("${VITASDK}/share/vita.cmake" REQUIRED)
 
 set(VITA_APP_NAME "Launcher")
 set(VITA_TITLEID  "SMLA00001")
-set(VITA_VERSION  "02.80")
+set(VITA_VERSION  "02.81")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-psabi -Wunused-variable -Wwrite-strings -fpermissive -std=c++17 -Wimplicit-fallthrough")

diff --git a/src/launcher.cpp b/src/launcher.cpp
@@ -253,7 +253,8 @@ namespace Windows {
 
         if (!show_categories_as_tabs)
         {
-            if ((pad_prev.buttons & SCE_CTRL_CIRCLE) && !(pad.buttons & SCE_CTRL_CIRCLE) && !paused)
+            if ((((pad_prev.buttons & SCE_CTRL_CIRCLE) && !(pad.buttons & SCE_CTRL_CIRCLE) && !swap_xo) ||
+                 ((pad_prev.buttons & SCE_CTRL_CROSS) && !(pad.buttons & SCE_CTRL_CROSS) && swap_xo)) && !paused)
             {
                 if (current_category->current_folder != &current_category->folders[0])
                 {
@@ -358,7 +359,14 @@ namespace Windows {
             }
             else
             {
-                ImGui_ImplVita2D_DisableButtons(SCE_CTRL_SQUARE | SCE_CTRL_CIRCLE);
+                if (swap_xo)
+                {
+                    ImGui_ImplVita2D_DisableButtons(SCE_CTRL_SQUARE | SCE_CTRL_CROSS);
+                }
+                else
+                {
+                    ImGui_ImplVita2D_DisableButtons(SCE_CTRL_SQUARE | SCE_CTRL_CIRCLE);
+                }
             }
         }
     }