mirror of
https://github.com/TomHarte/CLK.git
synced 2024-08-28 04:29:04 +00:00
Re-enabled the ball.
This commit is contained in:
parent
0242924fb4
commit
df93d7849d
@ -223,12 +223,10 @@ uint8_t Machine::get_output_pixel()
|
|||||||
_collisions[7] |= (1 << 6);
|
_collisions[7] |= (1 << 6);
|
||||||
|
|
||||||
// apply appropriate priority to pick a colour
|
// apply appropriate priority to pick a colour
|
||||||
uint8_t playfieldPixel = _playfieldOutput;// | ballPixel;
|
uint8_t playfieldPixel = _playfieldOutput | ballPixel;
|
||||||
uint8_t outputColour = playfieldPixel ? playfieldColour : _backgroundColour;
|
uint8_t outputColour = playfieldPixel ? playfieldColour : _backgroundColour;
|
||||||
|
|
||||||
if(!(_playfieldControl&0x04) || !playfieldPixel) {
|
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[1] || missilePixels[1]) outputColour = _playerColour[1];
|
||||||
if(playerPixels[0] || missilePixels[0]) outputColour = _playerColour[0];
|
if(playerPixels[0] || missilePixels[0]) outputColour = _playerColour[0];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user