ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A2600: Implemented atari graphics toggles except for playfield

This commit is contained in:
pjgat09 2012-10-30 23:12:09 +00:00
parent cd2ff4ed63
commit c1c85dba56
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
View File

@ -698,9 +698,13 @@ namespace BizHawk.Emulation.Consoles.Atari
// Pick the pixel color from collisions
uint pixelColor = palette[playField.bkColor];
uint pixelColor = 0x000000;
if (core.CoreInputComm.Atari2600_ShowBG)
{
pixelColor = palette[playField.bkColor];
}
if ((collisions & CXPF) != 0)
if ((collisions & CXPF) != 0) // && core.CoreInputComm.Atari2600_ShowPF)
{
if (playField.score)
{
@ -722,34 +726,49 @@ namespace BizHawk.Emulation.Consoles.Atari
if ((collisions & CXBL) != 0)
{
ball.collisions |= collisions;
pixelColor = palette[playField.pfColor];
if (core.CoreInputComm.Atari2600_ShowBall)
{
pixelColor = palette[playField.pfColor];
}
}
if ((collisions & CXM1) != 0)
{
player1.missile.collisions |= collisions;
pixelColor = palette[player1.color];
if (core.CoreInputComm.Atari2600_ShowMissle2)
{
pixelColor = palette[player1.color];
}
}
if ((collisions & CXP1) != 0)
{
player1.collisions |= collisions;
pixelColor = palette[player1.color];
if (core.CoreInputComm.Atari2600_ShowPlayer2)
{
pixelColor = palette[player1.color];
}
}
if ((collisions & CXM0) != 0)
{
player0.missile.collisions |= collisions;
pixelColor = palette[player0.color];
if (core.CoreInputComm.Atari2600_ShowMissle1)
{
pixelColor = palette[player0.color];
}
}
if ((collisions & CXP0) != 0)
{
player0.collisions |= collisions;
pixelColor = palette[player0.color];
if (core.CoreInputComm.Atari2600_ShowPlayer1)
{
pixelColor = palette[player0.color];
}
}
if (playField.priority && (collisions & CXPF) != 0)
if (playField.priority && (collisions & CXPF) != 0) // && core.CoreInputComm.Atari2600_ShowPF)
{
if (playField.score)
{