6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 16:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Fixed incorrect duplication.

Browse Source
This commit is contained in:
Thomas Harte 2016-05-18 21:50:28 -04:00
parent 3765c5fbb5
commit e61392d3fb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Machines/Atari2600/Atari2600.cpp
View File

@ -167,8 +167,8 @@ uint8_t Machine::get_output_pixel()
switch(repeatMask) switch(repeatMask)
{ {
default: default:
_pixelCounter[c]+=4; _pixelCounter[c] += 4;
_pixelCounter[c+2]+=4; _pixelCounter[c+2] += 4;
break; break;
case 5: case 5:
_pixelCounter[c] += 2; _pixelCounter[c] += 2;
@ -268,7 +268,7 @@ void Machine::output_pixels(unsigned int count)
{ {
for(int c = 0; c < 5; c++) for(int c = 0; c < 5; c++)
{ {
if((_objectMotion[c]^8^_hMoveCounter) == 0xf) if(((_objectMotion[c] >> 4)^8^_hMoveCounter) == 0xf)
{ {
_hMoveFlags &= ~(1 << c); _hMoveFlags &= ~(1 << c);
} }
@ -540,7 +540,7 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
case 0x22: case 0x22:
case 0x23: case 0x23:
case 0x24: case 0x24:
_objectMotion[decodedAddress - 0x20] = (*value) >> 4; _objectMotion[decodedAddress - 0x20] = *value;
break; break;
case 0x25: _playerGraphicsLatchEnable[0] = *value; break; case 0x25: _playerGraphicsLatchEnable[0] = *value; break;

2
Machines/Atari2600/Atari2600.hpp
View File

@ -106,7 +106,7 @@ class Machine: public CPU6502::Processor<Machine> {
// object counters // object counters
uint8_t _objectCounter[5]; uint8_t _objectCounter[5];
uint8_t _pixelCounter[5]; int _pixelCounter[5];
// joystick state // joystick state
uint8_t _piaDataDirection[2]; uint8_t _piaDataDirection[2];