Merge branch 'master' of https://github.com/86Box/86Box.git into EngiNerd

2020-12-13 16:55:52 +01:00
parent 901a75bb5d 7a905168e2
commit 4a00adc501
45 changed files with 1023 additions and 762 deletions
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -29,7 +29,7 @@ machine_xt_common_init(const machine_t *model)
 	device_add(&fdc_xt_device);
    
    nmi_init();
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 }