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

This commit is contained in:
EngiNerd89
2020-12-13 16:55:52 +01:00
45 changed files with 1023 additions and 762 deletions

View File

@@ -717,7 +717,7 @@ machine_xt_olim24_init(const machine_t *model)
/* FIXME: make sure this is correct?? */
device_add(&at_nvr_device);
if (joystick_type != JOYSTICK_TYPE_NONE)
if (joystick_type)
device_add(&gameport_device);
nmi_init();
@@ -760,7 +760,7 @@ machine_xt_olim240_init(const machine_t *model)
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_xt_device);
if (joystick_type != JOYSTICK_TYPE_NONE)
if (joystick_type)
device_add(&gameport_device);
nmi_init();
@@ -833,7 +833,7 @@ machine_xt_olim15_init(const machine_t *model)
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_xt_device);
if (joystick_type != JOYSTICK_TYPE_NONE)
if (joystick_type)
device_add(&gameport_device);
nmi_init();