1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00

Merge pull request #1276 from TomHarte/AppleIIColourText

Don't disable the colour burst in mixed mode.
This commit is contained in:
Thomas Harte 2023-12-18 21:53:07 -05:00 committed by GitHub
commit be7e776fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -460,7 +460,10 @@ template <class BusHandler, bool is_iie> class Video: public VideoBase {
}
int second_blank_start;
if(!is_text_mode(graphics_mode(row_+1))) {
// Colour burst is present on all lines of the display if graphics mode is enabled on the top
// portion; therefore use the graphics mode on line 0 rather than the current line, to avoid
// disabling it in mixed modes.
if(!is_text_mode(graphics_mode(0))) {
const int colour_burst_start = std::max(first_sync_column + sync_length + 1, column_);
const int colour_burst_end = std::min(first_sync_column + sync_length + 4, ending_column);
if(colour_burst_end > colour_burst_start) {