From df93d7849da8cbd6c9bb0870a7692bcdaad90509 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 22 May 2016 14:38:14 -0400 Subject: [PATCH] Re-enabled the ball. --- Machines/Atari2600/Atari2600.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index 62ea63a34..19b7b585c 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -223,12 +223,10 @@ uint8_t Machine::get_output_pixel() _collisions[7] |= (1 << 6); // apply appropriate priority to pick a colour - uint8_t playfieldPixel = _playfieldOutput;// | ballPixel; + uint8_t playfieldPixel = _playfieldOutput | ballPixel; uint8_t outputColour = playfieldPixel ? playfieldColour : _backgroundColour; if(!(_playfieldControl&0x04) || !playfieldPixel) { -// if(missilePixels[1]) outputColour = _playerColour[1]; -// if(missilePixels[0]) outputColour = _playerColour[0]; if(playerPixels[1] || missilePixels[1]) outputColour = _playerColour[1]; if(playerPixels[0] || missilePixels[0]) outputColour = _playerColour[0]; }