From 81dd75f7d7db2967d00075bd443c85e8b042251d Mon Sep 17 00:00:00 2001 From: arbee Date: Wed, 12 Apr 2023 15:25:05 -0400 Subject: apple2video: Fixed another regression where composite double-hi-res was usually monochrome. [R. Belmont] --- src/mame/apple/apple2video.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mame/apple/apple2video.cpp b/src/mame/apple/apple2video.cpp index b37e555d4a1..7753ecab162 100644 --- a/src/mame/apple/apple2video.cpp +++ b/src/mame/apple/apple2video.cpp @@ -640,6 +640,7 @@ void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, c endrow = (std::min)(endrow, cliprect.bottom()); int const startcol = (cliprect.left() / 14); int const stopcol = (cliprect.right() / 14) + 1; + const bool bIsRGBMonitor = rgb_monitor(); uint8_t const *const vram = &m_ram_ptr[page]; uint8_t const *const vaux = (m_aux_ptr ? m_aux_ptr : vram) + page; @@ -714,7 +715,7 @@ void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, c { unsigned const w = words[col] + (words[col+1] << 14); - unsigned const color_mask = (rgbmode == 3) ? -1u : + unsigned const color_mask = (rgbmode == 3 || !bIsRGBMonitor) ? -1u : (vaux_row[col] >> 7) * 0x7f + (vram_row[col] >> 7) * 0x3f80 + (vaux_row[col+1] >> 7) * 0x1fc000 + (vram_row[col+1] >> 7) * 0xfe00000; -- cgit v1.2.3