From 4968ccf46d75237d32ea5b60da93cfe376b3ea07 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 19 Jun 2021 13:08:14 -0400 Subject: [PATCH] Corrects attributed mode. --- Machines/Enterprise/Nick.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Machines/Enterprise/Nick.cpp b/Machines/Enterprise/Nick.cpp index 64fa2034f..82e979845 100644 --- a/Machines/Enterprise/Nick.cpp +++ b/Machines/Enterprise/Nick.cpp @@ -323,7 +323,7 @@ void Nick::run_for(Cycles duration) { case Mode::Attr: // Reload the attribute address if VRES is set. if(line_parameters_[1] & 0x10) { - line_data_pointer_[1] = uint16_t(line_parameters_[6] | (line_parameters_[7] << 8)); + line_data_pointer_[0] = uint16_t(line_parameters_[4] | (line_parameters_[5] << 8)); } break; } @@ -500,8 +500,8 @@ template void Nick::output_attributed(uint16_t *target, int columns) { static_assert(bpp == 1 || bpp == 2 || bpp == 4 || bpp == 8); for(int c = 0; c < columns; c++) { - const uint8_t pixels = ram_[line_data_pointer_[0]]; - const uint8_t attributes = ram_[line_data_pointer_[1]]; + const uint8_t pixels = ram_[line_data_pointer_[1]]; + const uint8_t attributes = ram_[line_data_pointer_[0]]; ++line_data_pointer_[0]; ++line_data_pointer_[1];