20230504 Release

This commit is contained in:
David Kuder 2023-05-04 23:45:29 -04:00
parent 8c512512a7
commit 0f011d9835
5 changed files with 23 additions and 10 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1019,15 +1019,15 @@ int format_card(void) {
goto cleanup; goto cleanup;
} }
if(cfg_cmd1("fe", next)) { }
backdrop(PROGNAME); if(cfg_cmd1("fe", next)) {
window(" Error ", 28, 7, 1); backdrop(PROGNAME);
gotoy(11); gotox(8); window(" Error ", 28, 7, 1);
cprintf("Unable to erase block $%04X", next); gotoy(11); gotox(8);
ok_button(); cprintf("Unable to erase block $%04X", next);
ok_button();
goto cleanup; goto cleanup;
}
} }
return 1; return 1;
@ -1460,6 +1460,10 @@ void color_editor(int palette_entry) {
rgb[1] = ((hardware_type == 'G') ? ((rgbpalette[palette_entry] >> 4) & 0xf) : ((rgbpalette[palette_entry] >> 3) & 0x7)); rgb[1] = ((hardware_type == 'G') ? ((rgbpalette[palette_entry] >> 4) & 0xf) : ((rgbpalette[palette_entry] >> 3) & 0x7));
rgb[2] = ((hardware_type == 'G') ? ((rgbpalette[palette_entry] >> 0) & 0xf) : ((rgbpalette[palette_entry] >> 0) & 0x7)); rgb[2] = ((hardware_type == 'G') ? ((rgbpalette[palette_entry] >> 0) & 0xf) : ((rgbpalette[palette_entry] >> 0) & 0x7));
VGA_TBCOLOR = 0xF0;
VGA_BORDER = palette_entry;
VGA_MONOMODE = 0xF0;
while(paint_menu >= 0) { while(paint_menu >= 0) {
if(paint_menu == 2) { if(paint_menu == 2) {
backdrop("Palette Editor"); backdrop("Palette Editor");
@ -1493,6 +1497,8 @@ void color_editor(int palette_entry) {
case 0x0B: case 0x0B:
if(rgb[selected_item] < maxval) { if(rgb[selected_item] < maxval) {
rgb[selected_item]++; rgb[selected_item]++;
CARD_REGISTER(0xC) = (palette_entry << 4) | (selected_item+1);
CARD_REGISTER(0xD) = rgb[selected_item];
paint_menu = 1; paint_menu = 1;
} }
break; break;
@ -1500,6 +1506,8 @@ void color_editor(int palette_entry) {
case 0x0A: case 0x0A:
if(rgb[selected_item] > 0) { if(rgb[selected_item] > 0) {
rgb[selected_item]--; rgb[selected_item]--;
CARD_REGISTER(0xC) = (palette_entry << 4) | (selected_item+1);
CARD_REGISTER(0xD) = rgb[selected_item];
paint_menu = 1; paint_menu = 1;
} }
break; break;
@ -1515,6 +1523,10 @@ void color_editor(int palette_entry) {
paint_menu = -1; paint_menu = -1;
} }
} }
VGA_TBCOLOR = (terminal_fgcolor << 4) | terminal_bgcolor;
VGA_BORDER = terminal_border;
VGA_MONOMODE = (mono_palette << 4);
} }
int video_menu_action(int action) { int video_menu_action(int action) {
@ -1835,6 +1847,7 @@ int main_menu_action(int action) {
backdrop(PROGNAME); backdrop(PROGNAME);
if(confirm(" Are you sure? ", "Save and exit?")) { if(confirm(" Are you sure? ", "Save and exit?")) {
write_config(); write_config();
cfg_cmd0("Rb");
clrscr(); clrscr();
exec("MENU.SYSTEM", ""); exec("MENU.SYSTEM", "");
return -1; return -1;
@ -1944,8 +1957,8 @@ void main (void) {
case 'r': case 'r':
paint_menu = main_menu_action(selected_item = 5); paint_menu = main_menu_action(selected_item = 5);
break; break;
case 'F': case 'E':
case 'f': case 'e':
paint_menu = main_menu_action(selected_item = 6); paint_menu = main_menu_action(selected_item = 6);
break; break;
case 0x1B: case 0x1B: