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

O2Hawk: collision bug fix

This commit is contained in:
alyosha-tas 2019-12-27 16:47:17 -05:00
parent 9015d36862
commit 49fc6839e6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs
View File

@ -146,6 +146,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
else if (addr == 0xA2)
{
VDC_collision = value;
//Console.WriteLine("VDC_collide: " + value + " " + Core.cpu.TotalExecutedCycles);
}
else if (addr == 0xA3)
{
@ -404,7 +405,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
}
// calculate collision
int col_bit = 0;
int col_bit = -1;
for (int i = 7; i >= 0; i--)
{
if (VDC_collision.Bit(i))
@ -413,11 +414,14 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
}
}
for (int i = 0; i < 8; i++)
if (col_bit >= 0)
{
if (Pixel_Stat.Bit(i) & Pixel_Stat.Bit(col_bit) && (i != col_bit))
for (int i = 0; i < 8; i++)
{
VDC_col_ret |= (byte)(1 << i);
if (Pixel_Stat.Bit(i) & Pixel_Stat.Bit(col_bit) && (i != col_bit))
{
VDC_col_ret |= (byte)(1 << i);
}
}
}
}