diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 28a9e7965..9b06df3d7 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -707,7 +707,7 @@ pc-98 anex86 font = # j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support. # Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command. # Possible values: off, on, auto, manual, 0, 1, 2. -# j3100type: Specifies the machine type for the Toshiba J-3100 emulation if enabled. +# j3100type: Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types. # Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx. dosv = off getsysfont = true diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index f700a5656..20916d5e9 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -342,7 +342,7 @@ pc-98 anex86 font = # j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support. # Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command. # Possible values: off, on, auto, manual, 0, 1, 2. -# j3100type: Specifies the machine type for the Toshiba J-3100 emulation if enabled. +# j3100type: Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types. # Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx. dosv = off getsysfont = true diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index fb3bb19c5..8a628b5dd 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -687,7 +687,7 @@ pc-98 show graphics layer on initialize = true # j3100: With the setting dosv=jp and a non-off value of this option, the Toshiba J-3100 machine will be emulated with DCGA support. # Setting to "on" or "auto" starts J-3100 automatically, and with the setting "manual" you can enter J-3100 mode with DCGA command. # Possible values: off, on, auto, manual, 0, 1, 2. -# j3100type: Specifies the machine type for the Toshiba J-3100 emulation if enabled. +# j3100type: Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types. # Possible values: default, gt, sgt, gx, gl, sl, sgx, ss, gs, sx, sxb, sxw, sxp, ez, zs, zx. dosv = off getsysfont = true diff --git a/include/dos_inc.h b/include/dos_inc.h index a66964dff..b53870512 100644 --- a/include/dos_inc.h +++ b/include/dos_inc.h @@ -38,8 +38,10 @@ struct CommandTail{ #pragma pack () #endif -#define IS_DOS_JAPANESE (mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 && mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F) -#define IS_DOS_CJK ((mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 || mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0xA1) && (mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F || mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0xFE)) +extern bool dos_kernel_disabled; + +#define IS_DOS_JAPANESE (!dos_kernel_disabled && mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 && mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F) +#define IS_DOS_CJK (!dos_kernel_disabled && ((mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0x81 || mem_readb(Real2Phys(dos.tables.dbcs) + 0x02) == 0xA1) && (mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0x9F || mem_readb(Real2Phys(dos.tables.dbcs) + 0x03) == 0xFE))) #define IS_DOSV (dos.set_jdosv_enabled || dos.set_kdosv_enabled || dos.set_cdosv_enabled || dos.set_pdosv_enabled) #define IS_JDOSV (dos.set_jdosv_enabled) #define IS_KDOSV (dos.set_kdosv_enabled) diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 522b9a288..b739c0843 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -2153,7 +2153,7 @@ void DOSBOX_SetupConfigSections(void) { Pstring = secprop->Add_string("j3100type",Property::Changeable::OnlyAtStart,"default"); Pstring->Set_values(j3100_types); - Pstring->Set_help("Specifies the machine type for the Toshiba J-3100 emulation if enabled."); + Pstring->Set_help("Specifies the Toshiba J-3100 machine type if J-3100 mode is enabled. The color palette will be changed with different machine types."); Pstring->SetBasic(true); secprop=control->AddSection_prop("video",&Null_Init);