From 81bc032b00e1f2cff852acc60e6f901cc4e122be Mon Sep 17 00:00:00 2001
From: Alexander Babikov <lemondrops358@gmail.com>
Date: Wed, 29 Dec 2021 09:48:56 +0500
Subject: [PATCH 1/3] Handle the internal name change for the S3 ViRGE/GX
 (formerly ViRGE/DX VBE 2.0)

---
 src/config.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/config.c b/src/config.c
index bda66d417..6c5e4e0b5 100644
--- a/src/config.c
+++ b/src/config.c
@@ -888,7 +888,10 @@ load_video(void)
 		}
 		free_p = 1;
 	}
-	gfxcard = video_get_video_from_internal_name(p);
+	if (!strcmp(p, "virge375_vbe20_pci")) /* migrate renamed cards */
+		gfxcard = video_get_video_from_internal_name("virge385_pci");
+	else
+		gfxcard = video_get_video_from_internal_name(p);
 	if (free_p)
 		free(p);
     }

From 00640bdc44b87e3c0b5422140fc95012a293cf09 Mon Sep 17 00:00:00 2001
From: Alexander Babikov <lemondrops358@gmail.com>
Date: Wed, 29 Dec 2021 09:49:38 +0500
Subject: [PATCH 2/3] Fix a typo in CH Flightstick Pro's internal name

---
 src/config.c        | 4 +++-
 src/game/gameport.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/config.c b/src/config.c
index 6c5e4e0b5..c37d0b18b 100644
--- a/src/config.c
+++ b/src/config.c
@@ -917,7 +917,7 @@ load_input_devices(void)
 
     p = config_get_string(cat, "joystick_type", NULL);
     if (p != NULL) {
-	if (!strcmp(p, "standard_2button"))
+	if (!strcmp(p, "standard_2button")) /* migrate renamed types */
 		joystick_type = joystick_get_from_internal_name("2axis_2button");
 	else if (!strcmp(p, "standard_4button"))
 		joystick_type = joystick_get_from_internal_name("2axis_4button");
@@ -925,6 +925,8 @@ load_input_devices(void)
 		joystick_type = joystick_get_from_internal_name("2axis_6button");
 	else if (!strcmp(p, "standard_8button"))
 		joystick_type = joystick_get_from_internal_name("2axis_8button");
+	else if (!strcmp(p, "ch_flighstick_pro"))
+		joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
 
 	joystick_type = joystick_get_from_internal_name(p);
 	if (!joystick_type) {
diff --git a/src/game/gameport.c b/src/game/gameport.c
index 145262278..0d48444fd 100644
--- a/src/game/gameport.c
+++ b/src/game/gameport.c
@@ -88,7 +88,7 @@ static const struct {
     { "3axis_2button",		&joystick_3axis_2button	},
     { "3axis_4button",		&joystick_3axis_4button	},
     { "4axis_4button",		&joystick_4axis_4button	},
-    { "ch_flighstick_pro",	&joystick_ch_flightstick_pro	},
+    { "ch_flightstick_pro",	&joystick_ch_flightstick_pro	},
     { "sidewinder_pad",		&joystick_sw_pad		},
     { "thrustmaster_fcs",	&joystick_tm_fcs		},
     { "",					NULL					}

From 29595ce4f774cb81eb5fc4843bb7644d599f97f8 Mon Sep 17 00:00:00 2001
From: Alexander Babikov <lemondrops358@gmail.com>
Date: Wed, 29 Dec 2021 09:51:42 +0500
Subject: [PATCH 3/3] Fix joystick type migration not working as intended

Map legacy integer-based joystick type options directly
---
 src/config.c | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/config.c b/src/config.c
index c37d0b18b..08326da71 100644
--- a/src/config.c
+++ b/src/config.c
@@ -927,21 +927,41 @@ load_input_devices(void)
 		joystick_type = joystick_get_from_internal_name("2axis_8button");
 	else if (!strcmp(p, "ch_flighstick_pro"))
 		joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
+	else
+		joystick_type = joystick_get_from_internal_name(p);
 
-	joystick_type = joystick_get_from_internal_name(p);
 	if (!joystick_type) {
 		/* Try to read an integer for backwards compatibility with old configs */
-		c = config_get_int(cat, "joystick_type", 8);
-		switch (c) {
-			case 0: case 1: case 2: case 3: /* 2-axis joysticks */
-				joystick_type = c + 1;
-				break;
-			case 4: case 5: case 6: case 7: /* other joysticks */
-				joystick_type = c + 3;
-				break;
-			default: /* "None" (8) or invalid value */
-				joystick_type = 0;
-				break;
+		if (!strcmp(p, "0")) /* workaround for config_get_int returning 0 on non-integer data */
+			joystick_type = joystick_get_from_internal_name("2axis_2button");
+		else {
+			c = config_get_int(cat, "joystick_type", 8);
+			switch (c) {
+				case 1:
+					joystick_type = joystick_get_from_internal_name("2axis_4button");
+					break;
+				case 2:
+					joystick_type = joystick_get_from_internal_name("2axis_6button");
+					break;
+				case 3:
+					joystick_type = joystick_get_from_internal_name("2axis_8button");
+					break;
+				case 4:
+					joystick_type = joystick_get_from_internal_name("4axis_4button");
+					break;
+				case 5:
+					joystick_type = joystick_get_from_internal_name("ch_flightstick_pro");
+					break;
+				case 6:
+					joystick_type = joystick_get_from_internal_name("sidewinder_pad");
+					break;
+				case 7:
+					joystick_type = joystick_get_from_internal_name("thrustmaster_fcs");
+					break;
+				default:
+					joystick_type = 0;
+					break;
+			}
 		}
 	}
     } else