From 93ca6212a188efe0774887aa439a372c3d6de8d2 Mon Sep 17 00:00:00 2001 From: Wengier Date: Fri, 19 Nov 2021 19:12:36 -0500 Subject: [PATCH] Show VGA-specific tools only in VGA --- src/dos/dos_programs.cpp | 5 ++++- src/shell/shell.cpp | 23 ++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp index 6809f6661..f7cc22f8c 100644 --- a/src/dos/dos_programs.cpp +++ b/src/dos/dos_programs.cpp @@ -8356,6 +8356,9 @@ void DOS_SetupPrograms(void) { PROGRAMS_MakeFile("MODE.COM", MODE_ProgramStart,"/DOS/"); PROGRAMS_MakeFile("MOUSE.COM", MOUSE_ProgramStart,"/DOS/"); PROGRAMS_MakeFile("SETCOLOR.COM", SETCOLOR_ProgramStart,"/BIN/"); + } + + if (IS_VGA_ARCH) { PROGRAMS_MakeFile("80X60.COM", TEXT80X60_ProgramStart,"/TEXTUTIL/"); PROGRAMS_MakeFile("80X50.COM", TEXT80X50_ProgramStart,"/TEXTUTIL/"); PROGRAMS_MakeFile("80X43.COM", TEXT80X43_ProgramStart,"/TEXTUTIL/"); @@ -8364,6 +8367,7 @@ void DOS_SetupPrograms(void) { PROGRAMS_MakeFile("132X50.COM", TEXT132X50_ProgramStart,"/TEXTUTIL/"); PROGRAMS_MakeFile("132X43.COM", TEXT132X43_ProgramStart,"/TEXTUTIL/"); PROGRAMS_MakeFile("132X25.COM", TEXT132X25_ProgramStart,"/TEXTUTIL/"); + PROGRAMS_MakeFile("DCGA.COM", DCGA_ProgramStart,"/TEXTUTIL/"); } PROGRAMS_MakeFile("COLOR.COM",COLOR_ProgramStart,"/BIN/"); @@ -8388,7 +8392,6 @@ void DOS_SetupPrograms(void) { PROGRAMS_MakeFile("TREE.COM", TREE_ProgramStart,"/DOS/"); PROGRAMS_MakeFile("DELTREE.EXE",DELTREE_ProgramStart,"/DOS/"); PROGRAMS_MakeFile("AUTOTYPE.COM", AUTOTYPE_ProgramStart,"/BIN/"); - PROGRAMS_MakeFile("DCGA.COM", DCGA_ProgramStart,"/TEXTUTIL/"); if (IS_DOSV) PROGRAMS_MakeFile("VTEXT.COM", VTEXT_ProgramStart,"/TEXTUTIL/"); } diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp index 240e51c63..b7dac9456 100644 --- a/src/shell/shell.cpp +++ b/src/shell/shell.cpp @@ -1737,21 +1737,18 @@ void SHELL_Init() { VFILE_RegisterBuiltinFileBlob(bfb_4HELP_EXE, "/4DOS/"); VFILE_RegisterBuiltinFileBlob(bfb_4DOS_HLP, "/4DOS/"); VFILE_RegisterBuiltinFileBlob(bfb_4DOS_COM, "/4DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_VGA_COM, "/TEXTUTIL/"); - VFILE_RegisterBuiltinFileBlob(bfb_SCANRES_COM, "/TEXTUTIL/"); - VFILE_RegisterBuiltinFileBlob(bfb_EGA_COM, "/TEXTUTIL/"); - VFILE_RegisterBuiltinFileBlob(bfb_CLR_COM, "/TEXTUTIL/"); - VFILE_RegisterBuiltinFileBlob(bfb_CGA_COM, "/TEXTUTIL/"); } - /* don't register 50 unless VGA */ - if (IS_VGA_ARCH) VFILE_RegisterBuiltinFileBlob(bfb_50_COM, "/TEXTUTIL/"); - - /* don't register 28.com unless EGA/VGA */ - if (IS_VGA_ARCH) - VFILE_RegisterBuiltinFileBlob(bfb_28_COM, "/TEXTUTIL/"); - else if (IS_EGA_ARCH) - VFILE_RegisterBuiltinFileBlob(bfb_28_COM_ega, "/TEXTUTIL/"); + if (IS_VGA_ARCH) { + VFILE_RegisterBuiltinFileBlob(bfb_VGA_COM, "/TEXTUTIL/"); + VFILE_RegisterBuiltinFileBlob(bfb_SCANRES_COM, "/TEXTUTIL/"); + VFILE_RegisterBuiltinFileBlob(bfb_EGA_COM, "/TEXTUTIL/"); + VFILE_RegisterBuiltinFileBlob(bfb_CLR_COM, "/TEXTUTIL/"); + VFILE_RegisterBuiltinFileBlob(bfb_CGA_COM, "/TEXTUTIL/"); + VFILE_RegisterBuiltinFileBlob(bfb_50_COM, "/TEXTUTIL/"); + VFILE_RegisterBuiltinFileBlob(bfb_28_COM, "/TEXTUTIL/"); + } else if (IS_EGA_ARCH) + VFILE_RegisterBuiltinFileBlob(bfb_28_COM_ega, "/TEXTUTIL/"); if (IS_VGA_ARCH) VFILE_RegisterBuiltinFileBlob(bfb_25_COM, "/TEXTUTIL/");