Oops! Labels!

Update XSTR_SIZE to 1859
scp-fs2open · Sep 28, 2024 · bbf029b · bbf029b
1 parent 9ffcf94
commit bbf029b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/code/controlconfig/controlsconfigcommon.cpp b/code/controlconfig/controlsconfigcommon.cpp
@@ -793,6 +793,8 @@ void control_config_common_init()
 	Axis_text[3] = vm_strdup(XSTR("rX Axis", 1650));	// XSTR 1024 - "Joystick rX Axis"
 	Axis_text[4] = vm_strdup(XSTR("rY Axis", 1651));	// XSTR 1025 - "Joystick rY Axis"
 	Axis_text[5] = vm_strdup(XSTR("rZ Axis", 1652));	// XSTR 1026 - "Joystick rZ Axis"
+	Axis_text[6] = vm_strdup(XSTR("U Axis", 1857));     // XSTR 1026 - "Joystick rZ Axis"
+	Axis_text[7] = vm_strdup(XSTR("V Axis", 1858));    // XSTR 1026 - "Joystick rZ Axis"
 
 	Mouse_button_text[0] = vm_strdup(XSTR("Left Button", 1027));
 	Mouse_button_text[1] = vm_strdup(XSTR("Right Button", 1028));
@@ -1206,6 +1208,8 @@ void LoadEnumsIntoAxisMap() {
 	mAxisNameToVal["RX_AXIS"] = JOY_RX_AXIS;
 	mAxisNameToVal["RY_AXIS"] = JOY_RY_AXIS;
 	mAxisNameToVal["RZ_AXIS"] = JOY_RZ_AXIS;
+	mAxisNameToVal["U_AXIS"] = JOY_U_AXIS;
+	mAxisNameToVal["V_AXIS"] = JOY_V_AXIS;
 }
 
 void LoadEnumsIntoHatMap() {

diff --git a/code/localization/localize.cpp b/code/localization/localize.cpp
@@ -64,7 +64,7 @@ bool *Lcl_unexpected_tstring_check = nullptr;
 // NOTE: with map storage of XSTR strings, the indexes no longer need to be contiguous,
 // but internal strings should still increment XSTR_SIZE to avoid collisions.
 // retail XSTR_SIZE = 1570
-// #define XSTR_SIZE	1857 // This is the next available ID
+// #define XSTR_SIZE	1859 // This is the next available ID
 
 
 // struct to allow for strings.tbl-determined x offset