Merge branch 'master' of https://github.com/xan1242/NFSU-XtendedInput

xan1242 · Sep 30, 2022 · feb1f07 · feb1f07
2 parents 3f7cad1 + 757b4a3
commit feb1f07
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Config-UG/EventReference.txt b/Config-UG/EventReference.txt
@@ -30,8 +30,8 @@ XINPUT_GAMEPAD_START
 XINPUT_GAMEPAD_BACK          
 XINPUT_GAMEPAD_LEFT_THUMB    
 XINPUT_GAMEPAD_RIGHT_THUMB   
-XINPUT_GAMEPAD_LEFT_SHOULDER 
-XINPUT_GAMEPAD_RIGHT_SHOULDER
+XINPUT_GAMEPAD_LEFT_SHOULDER (or XINPUT_GAMEPAD_LB)
+XINPUT_GAMEPAD_RIGHT_SHOULDER (or XINPUT_GAMEPAD_RB)
 XINPUT_GAMEPAD_A             
 XINPUT_GAMEPAD_B             
 XINPUT_GAMEPAD_X             

diff --git a/Config-UG2/EventReference.txt b/Config-UG2/EventReference.txt
@@ -30,8 +30,8 @@ XINPUT_GAMEPAD_START
 XINPUT_GAMEPAD_BACK          
 XINPUT_GAMEPAD_LEFT_THUMB    
 XINPUT_GAMEPAD_RIGHT_THUMB   
-XINPUT_GAMEPAD_LEFT_SHOULDER 
-XINPUT_GAMEPAD_RIGHT_SHOULDER
+XINPUT_GAMEPAD_LEFT_SHOULDER (or XINPUT_GAMEPAD_LB)
+XINPUT_GAMEPAD_RIGHT_SHOULDER (or XINPUT_GAMEPAD_RB)
 XINPUT_GAMEPAD_A             
 XINPUT_GAMEPAD_B             
 XINPUT_GAMEPAD_X             

diff --git a/NFSU_XtendedInput_XInputConfig.h b/NFSU_XtendedInput_XInputConfig.h
@@ -47,7 +47,9 @@ int bStringHash(char* a1);
 #define XINPUT_GAMEPAD_LEFT_THUMB_HASH      0xD89FD05E 
 #define XINPUT_GAMEPAD_RIGHT_THUMB_HASH     0x4A112211 
 #define XINPUT_GAMEPAD_LEFT_SHOULDER_HASH   0x80D7FD44 
-#define XINPUT_GAMEPAD_RIGHT_SHOULDER_HASH  0x7575D617 
+#define XINPUT_GAMEPAD_RIGHT_SHOULDER_HASH  0x7575D617
+#define XINPUT_GAMEPAD_LB_HASH				0x74BF0962
+#define XINPUT_GAMEPAD_RB_HASH				0x74BF0A28
 #define XINPUT_GAMEPAD_A_HASH               0xA6726515 
 #define XINPUT_GAMEPAD_B_HASH               0xA6726516 
 #define XINPUT_GAMEPAD_X_HASH               0xA672652C 
@@ -89,8 +91,10 @@ short int ConvertXInputNameToBitmask(char* InName)
 		return XINPUT_GAMEPAD_LEFT_THUMB;
 	case XINPUT_GAMEPAD_RIGHT_THUMB_HASH:
 		return XINPUT_GAMEPAD_RIGHT_THUMB;
+	case XINPUT_GAMEPAD_LB_HASH:
 	case XINPUT_GAMEPAD_LEFT_SHOULDER_HASH:
 		return XINPUT_GAMEPAD_LEFT_SHOULDER;
+	case XINPUT_GAMEPAD_RB_HASH:
 	case XINPUT_GAMEPAD_RIGHT_SHOULDER_HASH:
 		return XINPUT_GAMEPAD_RIGHT_SHOULDER;
 	case XINPUT_GAMEPAD_A_HASH: