From 3f566833425c6cbbe45608b83e46d4ea2ae89b3c Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 30 Jul 2018 23:08:45 -0400 Subject: [PATCH] Fixes order of deserialisation between auxiliary and base RAM. --- Machines/AppleII/Video.hpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Machines/AppleII/Video.hpp b/Machines/AppleII/Video.hpp index cf3212254..c27958a9d 100644 --- a/Machines/AppleII/Video.hpp +++ b/Machines/AppleII/Video.hpp @@ -385,21 +385,21 @@ template class Video: public VideoBase { for(int c = column_; c < pixel_end; ++c) { const uint16_t graphic = bus_handler_.perform_aux_read(static_cast(graphics_address + c)); - pixel_pointer_[0] = graphic & 0x01; - pixel_pointer_[1] = graphic & 0x02; - pixel_pointer_[2] = graphic & 0x04; - pixel_pointer_[3] = graphic & 0x08; - pixel_pointer_[4] = graphic & 0x10; - pixel_pointer_[5] = graphic & 0x20; - pixel_pointer_[6] = graphic & 0x40; - pixel_pointer_[7] = (graphic >> 8) & 0x01; - pixel_pointer_[8] = (graphic >> 8) & 0x02; - pixel_pointer_[9] = (graphic >> 8) & 0x04; - pixel_pointer_[10] = (graphic >> 8) & 0x08; - pixel_pointer_[11] = (graphic >> 8) & 0x10; - pixel_pointer_[12] = (graphic >> 8) & 0x20; - pixel_pointer_[13] = (graphic >> 8) & 0x40; - graphics_carry_ = (graphic >> 8) & 0x40; + pixel_pointer_[0] = (graphic >> 8) & 0x01; + pixel_pointer_[1] = (graphic >> 8) & 0x02; + pixel_pointer_[2] = (graphic >> 8) & 0x04; + pixel_pointer_[3] = (graphic >> 8) & 0x08; + pixel_pointer_[4] = (graphic >> 8) & 0x10; + pixel_pointer_[5] = (graphic >> 8) & 0x20; + pixel_pointer_[6] = (graphic >> 8) & 0x40; + pixel_pointer_[7] = graphic & 0x01; + pixel_pointer_[8] = graphic & 0x02; + pixel_pointer_[9] = graphic & 0x04; + pixel_pointer_[10] = graphic & 0x08; + pixel_pointer_[11] = graphic & 0x10; + pixel_pointer_[12] = graphic & 0x20; + pixel_pointer_[13] = graphic & 0x40; + graphics_carry_ = graphic & 0x40; pixel_pointer_ += 14; } } break;