6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into Amiga

Browse Source
This commit is contained in:
Thomas Harte 2021-09-23 23:00:03 -04:00
commit 9012a7f5e1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Machines/Atari/2600/Cartridges/Pitfall2.hpp
View File

@ -105,7 +105,7 @@ class Pitfall2: public BusExtender {
int table_position = 0; int table_position = 0;
for(int c = 0; c < 3; c++) { for(int c = 0; c < 3; c++) {
audio_channel_[c] = (audio_channel_[c] + cycles_to_run_for) % (1 + top_[5 + c]); audio_channel_[c] = uint8_t((audio_channel_[c] + cycles_to_run_for) % (1 + top_[5 + c]));
if((featcher_address_[5 + c] & 0x1000) && ((top_[5 + c] - audio_channel_[c]) > bottom_[5 + c])) { if((featcher_address_[5 + c] & 0x1000) && ((top_[5 + c] - audio_channel_[c]) > bottom_[5 + c])) {
table_position |= 0x4 >> c; table_position |= 0x4 >> c;
} }

2
Storage/Disk/DiskImage/Formats/AppleDSK.cpp
View File

@ -90,7 +90,7 @@ std::shared_ptr<Track> AppleDSK::get_track_at_position(Track::Address address) {
// Apply inter-track skew; skew is about 40ms between each track; assuming 300RPM that's // Apply inter-track skew; skew is about 40ms between each track; assuming 300RPM that's
// 1/5th of a revolution. // 1/5th of a revolution.
const size_t offset_in_fifths = address.position.as_int() % 5; const size_t offset_in_fifths = size_t(address.position.as_int() % 5);
segment.rotate_right(offset_in_fifths * segment.data.size() / 5); segment.rotate_right(offset_in_fifths * segment.data.size() / 5);
return std::make_shared<PCMTrack>(segment); return std::make_shared<PCMTrack>(segment);