diff --git a/Machines/Amiga/Blitter.cpp b/Machines/Amiga/Blitter.cpp index 82316b4be..238f8abbc 100644 --- a/Machines/Amiga/Blitter.cpp +++ b/Machines/Amiga/Blitter.cpp @@ -63,7 +63,7 @@ bool Blitter::advance() { printf("!!! %08x\n", pointer_[3]); ram_[pointer_[3] & ram_mask_] = 0xffff; - --height_; + height_ = 0; return true; } diff --git a/Machines/Amiga/Chipset.cpp b/Machines/Amiga/Chipset.cpp index dba3ac3d8..7d98b98ce 100644 --- a/Machines/Amiga/Chipset.cpp +++ b/Machines/Amiga/Chipset.cpp @@ -255,13 +255,13 @@ template void Chipset::output() { ((current_bitplanes_[3]&4) << 1) | ((current_bitplanes_[4]&4) << 2) ]; - pixels_[3] = 0;/*palette_[ + pixels_[3] = palette_[ ((current_bitplanes_[0]&8) >> 3) | ((current_bitplanes_[1]&8) >> 2) | ((current_bitplanes_[2]&8) >> 1) | ((current_bitplanes_[3]&8) << 0) | ((current_bitplanes_[4]&8) << 1) - ];*/ + ]; current_bitplanes_ >>= 4; pixels_ += 4; @@ -378,7 +378,7 @@ template int Chipset::advance_slots(int first_slot, int last_ C10(200); C10(210); C(220); C(221); C(222); C(223); C(224); C(225); C(226); C(227); C(228); - break; +// break; default: assert(false); } diff --git a/Machines/Amiga/Chipset.hpp b/Machines/Amiga/Chipset.hpp index 3cb31818a..305815db9 100644 --- a/Machines/Amiga/Chipset.hpp +++ b/Machines/Amiga/Chipset.hpp @@ -202,7 +202,7 @@ class Chipset { /// Forces a reload of address @c id (i.e. 0 or 1) and restarts the Copper. template void reload() { - address_ = pointer_[id] >> 1; + address_ = pointer_[id]; state_ = State::FetchFirstWord; }