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

2021-06-13 21:45:53 +02:00
parent d504452930 73bdd27ba8
commit 2d97a02473
73 changed files with 3442 additions and 1587 deletions
--- a/src/machine/m_xt_philips.c
+++ b/src/machine/m_xt_philips.c
@@ -152,8 +152,7 @@ machine_xt_philips_common_init(const machine_t *model)

    nmi_init();

-    if (joystick_type)
-	device_add(&gameport_device);
+    standalone_gameport_type = &gameport_device;

    device_add(&keyboard_pc_device);