From 758549ceca01945629b66be70ae63da82b6a4162 Mon Sep 17 00:00:00 2001 From: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com> Date: Wed, 2 Sep 2026 18:58:45 -0400 Subject: [PATCH] chore: cleanup the getcontrollertype stuff --- 4J_Input/Windows64/4J_Input.cpp | 18 +++----------- 4J_Input/Windows64/INP_Main.cpp | 5 ++-- 4J_Input/Windows64/INP_Main.h | 44 +++++++++++++++++---------------- Headers/Windows64/4J_Input.h | 2 +- 4 files changed, 30 insertions(+), 39 deletions(-) diff --git a/4J_Input/Windows64/4J_Input.cpp b/4J_Input/Windows64/4J_Input.cpp index e45197f..b5eccad 100644 --- a/4J_Input/Windows64/4J_Input.cpp +++ b/4J_Input/Windows64/4J_Input.cpp @@ -175,21 +175,9 @@ void C_4JInput::GetText(uint16_t *UTF16String) InternalKeyboard.GetText(UTF16String); } -const char* C_4JInput::PollControllerType(int ipad) { - const char* GamepadType = InternalInputManager.GetGamepadType(ipad); - - if (!GamepadType) - return "UNKNOWN"; - - if (strcmp(GamepadType, "SWITCH_PRO") == 0 || - strcmp(GamepadType, "JOYCON_PAIR") == 0 || - strcmp(GamepadType, "JOYCON_L") == 0 || - strcmp(GamepadType, "JOYCON_R") == 0) - { - return "SWITCH"; - } - - return GamepadType; // str1k3r - if not one of the switch types, return the type itself +const char* C_4JInput::GetControllerType(int ipad) +{ + return InternalInputManager.GetControllerType(ipad); //strk13r - mrow mrow mrow mrowwwwwwwwwww, i am silly kitty } bool C_4JInput::VerifyStrings(WCHAR **pwStringA, int iStringC, int (*Func)(LPVOID, STRING_VERIFY_RESPONSE *), LPVOID lpParam) diff --git a/4J_Input/Windows64/INP_Main.cpp b/4J_Input/Windows64/INP_Main.cpp index 63f0e63..4172f54 100644 --- a/4J_Input/Windows64/INP_Main.cpp +++ b/4J_Input/Windows64/INP_Main.cpp @@ -314,14 +314,15 @@ unsigned int CInput::GetGameJoypadMaps(unsigned char ucMap, unsigned char ucActi return m_JoypadMap[ucMap][ucAction]; } -const char* CInput::GetGamepadType(int iPad) +//str1k3r - renamed to match the Orbis Input lib, why did i rename it cause tism +const char* CInput::GetControllerType(int iPad) { if (!m_Joypads[iPad].m_pGamepad) { return "UNKNOWN"; } - return GamepadTypeName(SDL_GetGamepadType(m_Joypads[iPad].m_pGamepad)); + return GetControllerName(SDL_GetGamepadType(m_Joypads[iPad].m_pGamepad)); // str1k3r - magic we return it :shocked: } void CInput::SetJoypadMapVal(int iPad, unsigned char ucMap) diff --git a/4J_Input/Windows64/INP_Main.h b/4J_Input/Windows64/INP_Main.h index 3a7e027..ddaaae9 100644 --- a/4J_Input/Windows64/INP_Main.h +++ b/4J_Input/Windows64/INP_Main.h @@ -31,26 +31,6 @@ SOFTWARE. class CInput { -private: - const char* GamepadTypeName(SDL_GamepadType type) - { - switch (type) - { - case SDL_GAMEPAD_TYPE_UNKNOWN: return "UNKNOWN"; - case SDL_GAMEPAD_TYPE_GAMECUBE: return "GAMECUBE"; - case SDL_GAMEPAD_TYPE_STANDARD: return "STANDARD"; - case SDL_GAMEPAD_TYPE_XBOX360: return "XBOX360"; - case SDL_GAMEPAD_TYPE_XBOXONE: return "XBOXONE"; - case SDL_GAMEPAD_TYPE_PS3: return "PS3"; - case SDL_GAMEPAD_TYPE_PS4: return "PS4"; - case SDL_GAMEPAD_TYPE_PS5: return "PS5"; - case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO: return "SWITCH_PRO"; - case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_LEFT: return "JOYCON_L"; - case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT: return "JOYCON_R"; - case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_PAIR: return "JOYCON_PAIR"; - default: return "UNKNOWN"; - } - } public: struct JOYPAD { @@ -121,7 +101,7 @@ public: void SetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction, unsigned int uiActionVal); unsigned int GetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction); - const char* GetGamepadType(int iPad); + const char* GetControllerType(int iPad); void SetJoypadMapVal(int iPad, unsigned char ucMap); unsigned char GetJoypadMapVal(int iPad); @@ -204,6 +184,28 @@ public: unsigned int m_uiDebugSequenceIndex; int (*m_pDebugSequenceFn)(void *); LPVOID m_pDebugSequenceParam; + +private: + const char* GetControllerName(SDL_GamepadType type) + { + switch (type) + { + case SDL_GAMEPAD_TYPE_UNKNOWN: return "UNKNOWN"; + case SDL_GAMEPAD_TYPE_GAMECUBE: return "GAMECUBE"; + case SDL_GAMEPAD_TYPE_STANDARD: return "STANDARD"; + case SDL_GAMEPAD_TYPE_XBOX360: return "XBOX360"; + case SDL_GAMEPAD_TYPE_XBOXONE: return "XBOXONE"; + case SDL_GAMEPAD_TYPE_PS3: return "PS3"; + case SDL_GAMEPAD_TYPE_PS4: return "PS4"; + case SDL_GAMEPAD_TYPE_PS5: return "PS5"; + //str1k3r - we are ALL FROM THE SWITCH JUST RETURN THE SAMETHING, mrow + case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO: + case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_LEFT: + case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT: + case SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_JOYCON_PAIR: return "SWITCH"; + default: return "UNKNOWN"; + } + } }; // Singleton diff --git a/Headers/Windows64/4J_Input.h b/Headers/Windows64/4J_Input.h index 2ed4d40..017e3b8 100644 --- a/Headers/Windows64/4J_Input.h +++ b/Headers/Windows64/4J_Input.h @@ -136,7 +136,7 @@ public: EKeyboardResult RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int( *Func)(LPVOID,const bool),LPVOID lpParam,C_4JInput::EKeyboardMode eMode); void DestroyKeyboard(); void GetText(uint16_t *UTF16String); - const char* PollControllerType(int ipad); + const char* GetControllerType(int ipad); void SetLostInputControlCallback(void( *Func)(LPVOID, bool),LPVOID lpParam);