chore: cleanup the getcontrollertype stuff

4J_Input/Windows64/4J_Input.cpp

@@ -119,6 +119,16 @@ bool C_4JInput::IsPadConnected(int iPad)
     return InternalInputManager.IsPadConnected(iPad);
 }
 
+void C_4JInput::SetSelectBackSwapped(bool swapped)
+{
+    InternalInputManager.SetSelectBackSwapped(swapped);
+}
+
+bool C_4JInput::IsSelectBackSwapped()
+{
+    return InternalInputManager.IsSelectBackSwapped();
+}
+
 float C_4JInput::GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay)
 {
     return InternalInputManager.GetJoypadStick_LX(iPad, bCheckMenuDisplay);
@@ -165,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)

4J_Input/Windows64/INP_Main.cpp

@@ -27,6 +27,8 @@ SOFTWARE.
 
 CInput InternalInputManager;
 
+bool m_SelectBackSwapped = false;
+
 CInput::CInput()
 {
     m_Keyboard = CKeyboard();
@@ -312,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)
@@ -400,6 +403,16 @@ bool CInput::IsPadConnected(int iPad)
     return m_Joypads[iPad].m_bIsConnected;
 }
 
+void CInput::SetSelectBackSwapped(bool swapped)
+{
+	m_SelectBackSwapped = swapped;
+}
+
+bool CInput::IsSelectBackSwapped()
+{
+	return m_SelectBackSwapped;
+}
+
 void CInput::SetSigninJoypadMask(unsigned int mask)
 {
     m_uiSigninJoypadMask = mask;

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);
 
@@ -129,6 +109,8 @@ public:
     void SetJoypadStickTriggerMap(int iPad, unsigned int uiFrom, unsigned int uiTo);
 
     bool IsPadConnected(int iPad);
+	void SetSelectBackSwapped(bool swapped);
+	bool IsSelectBackSwapped();
     void SetSigninJoypadMask(unsigned int mask);
     unsigned int GetValue(int iPad, unsigned char ucAction, bool bRepeat = false);
     bool IsSet(int iPad, unsigned char ucAction);
@@ -202,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

Headers/Windows64/4J_Input.h

@@ -118,7 +118,8 @@ public:
 	void				SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam );
 	FLOAT				GetIdleSeconds(int iPad);
 	bool				IsPadConnected(int iPad);
-	bool				IsCircleCrossSwapped();
+	void				SetSelectBackSwapped(bool swapped);
+	bool				IsSelectBackSwapped();
 
 	// In-Game values which may have been remapped due to Southpaw, swap triggers, etc
 	float				GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay=true);
@@ -135,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);