sc support and textures

ThirteenAG · Dec 30, 2023 · d3b6eff · d3b6eff
1 parent 4ff026d
commit d3b6eff
Show file tree

Hide file tree

Showing 42 changed files with 10 additions and 4 deletions.
diff --git a/data/plugins/MaxPayne3.FusionFix.ini b/data/plugins/MaxPayne3.FusionFix.ini
@@ -13,3 +13,4 @@ GamepadIcons = 0
 ; 4 - Playstation 5
 ; 5 - Nintendo Switch
 ; 6 - Steam Deck
+; 7 - Steam Controller
diff --git a/source/buttons.ixx b/source/buttons.ixx
@@ -6,6 +6,7 @@ module;
 export module buttons;
 
 import common;
+import comvars;
 import settings;
 
 class Buttons
@@ -19,6 +20,7 @@ private:
         "PS5_",
         "SWITCH_",
         "SD_",
+        "SC_",
     };
 
     static inline std::vector<std::string> buttons = {
@@ -123,6 +125,8 @@ public:
     {
         FusionFix::onInitEvent() += []()
         {
+            assert(gLastControllerTextureIndex == (btnPrefix.size() - 1));
+
             auto pattern = hook::pattern("B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? B9");
             gameButtonPtrs = *pattern.get_first<void**>(1);
 
@@ -145,7 +149,7 @@ public:
                     {
                         controllerDstTexPtr = (void**)(regs.esi + 0x104);
                         auto v = FusionFixSettings.GetInt("PREF_BUTTONS");
-                        if (v > 6) v = 0; else if (v < 0) v = 6;
+                        if (v > gLastControllerTextureIndex) v = 0; else if (v < 0) v = gLastControllerTextureIndex;
                         if (controllerTexPtrs[v])
                             *controllerDstTexPtr = controllerTexPtrs[v];
                     }
@@ -165,7 +169,7 @@ public:
                     if (oldVal == 3 && curVal == 4)
                     {
                         auto v = FusionFixSettings.GetInt("PREF_BUTTONS") + 1;
-                        if (v > 6) v = 0; else if (v < 0) v = 6;
+                        if (v > gLastControllerTextureIndex) v = 0; else if (v < 0) v = gLastControllerTextureIndex;
 
                         CIniReader iniWriter("");
                         iniWriter.WriteInteger("MAIN", "GamepadIcons", v);
@@ -175,7 +179,7 @@ public:
                     else if (oldVal == 4 && curVal == 3)
                     {
                         auto v = FusionFixSettings.GetInt("PREF_BUTTONS") - 1;
-                        if (v > 6) v = 0; else if (v < 0) v = 6;
+                        if (v > gLastControllerTextureIndex) v = 0; else if (v < 0) v = gLastControllerTextureIndex;
 
                         CIniReader iniWriter("");
                         iniWriter.WriteInteger("MAIN", "GamepadIcons", v);

diff --git a/source/comvars.ixx b/source/comvars.ixx
@@ -10,6 +10,7 @@ export HWND gWnd;
 export RECT gRect;
 export void* (__fastcall* getNativeAddress)(uintptr_t*, uint32_t, uint32_t);
 export uintptr_t* nativeHandlerPtrAddress;
+export constexpr auto gLastControllerTextureIndex = 7;
 
 class Common
 {

diff --git a/source/settings.ixx b/source/settings.ixx
@@ -24,7 +24,7 @@ public:
         mFusionPrefs["PREF_OUTLINESIZE"] = std::clamp(iniReader.ReadFloat("MAIN", "OutlinesSizeMultiplier", 1.0f), 0.0f, 10.0f);
         mFusionPrefs["PREF_BORDERLESS"] = std::clamp(iniReader.ReadInteger("MAIN", "BorderlessWindowed", 1), 0, 1);
         mFusionPrefs["PREF_LEDILLUMINATION"] = std::clamp(iniReader.ReadInteger("MAIN", "LightSyncRGB", 1), 0, 1);
-        mFusionPrefs["PREF_BUTTONS"] = std::clamp(iniReader.ReadInteger("MAIN", "GamepadIcons", 0), 0, 6);
+        mFusionPrefs["PREF_BUTTONS"] = std::clamp(iniReader.ReadInteger("MAIN", "GamepadIcons", 0), 0, gLastControllerTextureIndex);
 
         static std::once_flag flag;
         std::call_once(flag, [&]()

diff --git a/textures/platform/textures/buttons_pc.wtd/sc_a_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_a_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_b_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_b_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_back_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_back_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_down_arrow.dds b/textures/platform/textures/buttons_pc.wtd/sc_down_arrow.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_all.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_all.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_down.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_down.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_left.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_left.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_leftright.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_leftright.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_none.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_none.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_right.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_right.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_up.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_up.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_dpad_updown.dds b/textures/platform/textures/buttons_pc.wtd/sc_dpad_updown.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lb_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_lb_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_left_arrow.dds b/textures/platform/textures/buttons_pc.wtd/sc_left_arrow.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_all.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_all.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_down.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_down.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_left.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_left.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_leftright.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_leftright.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_none.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_none.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_right.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_right.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_up.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_up.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lstick_updown.dds b/textures/platform/textures/buttons_pc.wtd/sc_lstick_updown.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_lt_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_lt_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rb_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_rb_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_right_arrow.dds b/textures/platform/textures/buttons_pc.wtd/sc_right_arrow.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_all.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_all.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_down.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_down.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_left.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_left.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_leftright.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_leftright.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_none.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_none.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_right.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_right.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_up.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_up.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rstick_updown.dds b/textures/platform/textures/buttons_pc.wtd/sc_rstick_updown.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_rt_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_rt_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_start_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_start_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_up_arrow.dds b/textures/platform/textures/buttons_pc.wtd/sc_up_arrow.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_x_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_x_butt.dds
diff --git a/textures/platform/textures/buttons_pc.wtd/sc_y_butt.dds b/textures/platform/textures/buttons_pc.wtd/sc_y_butt.dds