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

Merge pull request #1095 from LuigiBlood/64dd_2 

[64DD] 64DD disk conversion fix
This commit is contained in:
zilmar 2016-05-24 04:05:28 +10:00
parent f8f19eaeba 5f342e73df
commit a00011b0f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64-core/N64System/N64DiskClass.cpp
View File

@ -290,7 +290,7 @@ void CN64Disk::ConvertDiskFormat()
atrack = 0; atrack = 0;
for (track = 0; track < ZoneTracks[zone]; track++) for (track = 0; track < ZoneTracks[zone]; track++)
{ {
if (track == SystemData[0x20 + zone * 0xC + atrack]) if (atrack < 0xC && track == SystemData[0x20 + zone * 0xC + atrack])
{ {
memset((void *)(&BlockData0), 0, BLOCKSIZE(zone)); memset((void *)(&BlockData0), 0, BLOCKSIZE(zone));
memset((void *)(&BlockData1), 0, BLOCKSIZE(zone)); memset((void *)(&BlockData1), 0, BLOCKSIZE(zone));
@ -327,7 +327,7 @@ void CN64Disk::ConvertDiskFormat()
atrack = 0xB; atrack = 0xB;
for (track = 1; track < ZoneTracks[zone] + 1; track++) for (track = 1; track < ZoneTracks[zone] + 1; track++)
{ {
if ((ZoneTracks[zone] - track) == SystemData[0x20 + (zone)* 0xC + atrack]) if (atrack > -1 && (ZoneTracks[zone] - track) == SystemData[0x20 + (zone)* 0xC + atrack])
{ {
memset((void *)(&BlockData0), 0, BLOCKSIZE(zone)); memset((void *)(&BlockData0), 0, BLOCKSIZE(zone));
memset((void *)(&BlockData1), 0, BLOCKSIZE(zone)); memset((void *)(&BlockData1), 0, BLOCKSIZE(zone));