mirror of
https://github.com/TomHarte/CLK.git
synced 2025-02-27 15:29:34 +00:00
Merge pull request #1276 from TomHarte/AppleIIColourText
Don't disable the colour burst in mixed mode.
This commit is contained in:
commit
be7e776fa4
@ -460,7 +460,10 @@ template <class BusHandler, bool is_iie> class Video: public VideoBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int second_blank_start;
|
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_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);
|
const int colour_burst_end = std::min(first_sync_column + sync_length + 4, ending_column);
|
||||||
if(colour_burst_end > colour_burst_start) {
|
if(colour_burst_end > colour_burst_start) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user