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

coleco: fix issue where sprite priority prevented sprite collision from firing

This commit is contained in:
beirich 2012-11-25 02:25:20 +00:00
parent 61292d59eb
commit b1ab7bd9f1
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
View File

@ -309,6 +309,9 @@ namespace BizHawk.Emulation.Consoles.Coleco
break; break;
} }
//if (i >= 5 && y==30)
// Console.WriteLine(i);
if (LargeSprites) Pattern &= 0xFC; // 16x16 sprites forced to 4-byte alignment if (LargeSprites) Pattern &= 0xFC; // 16x16 sprites forced to 4-byte alignment
int SpriteLine = scanLine - y; int SpriteLine = scanLine - y;
@ -320,14 +323,15 @@ namespace BizHawk.Emulation.Consoles.Coleco
if (LargeSprites && xp == OneCellSize) if (LargeSprites && xp == OneCellSize)
pv = VRAM[SpritePatternGeneratorBase + (Pattern * 8) + SpriteLine + 16]; pv = VRAM[SpritePatternGeneratorBase + (Pattern * 8) + SpriteLine + 16];
if ((pv & (1 << (7 - (xp & 7)))) > 0) if (Color != 0 && (pv & (1 << (7 - (xp & 7)))) > 0)
{ {
if (Color != 0 && ScanlinePriorityBuffer[x + xp] == 0) if (SpriteCollisionBuffer[x + xp] != 0)
StatusByte |= 0x20; // Set sprite collision flag
if (ScanlinePriorityBuffer[x + xp] == 0)
{ {
if (SpriteCollisionBuffer[x + xp] != 0)
StatusByte |= 0x20; // Set sprite collision flag
SpriteCollisionBuffer[x + xp] = 1;
ScanlinePriorityBuffer[x + xp] = 1; ScanlinePriorityBuffer[x + xp] = 1;
SpriteCollisionBuffer[x + xp] = 1;
FrameBuffer[(scanLine * 256) + x + xp] = PaletteTMS9918[Color & 0x0F]; FrameBuffer[(scanLine * 256) + x + xp] = PaletteTMS9918[Color & 0x0F];
} }
} }
@ -384,14 +388,15 @@ namespace BizHawk.Emulation.Consoles.Coleco
if (LargeSprites && xp == OneCellSize) if (LargeSprites && xp == OneCellSize)
pv = VRAM[SpritePatternGeneratorBase + (Pattern * 8) + SpriteLine + 16]; pv = VRAM[SpritePatternGeneratorBase + (Pattern * 8) + SpriteLine + 16];
if ((pv & (1 << (7 - ((xp/2) & 7)))) > 0) // xp/2 is due to sprite magnification if (Color != 0 && (pv & (1 << (7 - ((xp / 2) & 7)))) > 0) // xp/2 is due to sprite magnification
{ {
if (Color != 0 && ScanlinePriorityBuffer[x + xp] == 0) if (SpriteCollisionBuffer[x + xp] != 0)
StatusByte |= 0x20; // Set sprite collision flag
if (ScanlinePriorityBuffer[x + xp] == 0)
{ {
if (SpriteCollisionBuffer[x + xp] != 0)
StatusByte |= 0x20; // Set sprite collision flag
SpriteCollisionBuffer[x + xp] = 1;
ScanlinePriorityBuffer[x + xp] = 1; ScanlinePriorityBuffer[x + xp] = 1;
SpriteCollisionBuffer[x + xp] = 1;
FrameBuffer[(scanLine * 256) + x + xp] = PaletteTMS9918[Color & 0x0F]; FrameBuffer[(scanLine * 256) + x + xp] = PaletteTMS9918[Color & 0x0F];
} }
} }