Skip to content

Fixed issue with Batman Arcade game #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RetroGameDeveloper wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed issue with Batman Arcade game #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
238287e
Fixed issue with Batman Arcade game
May 23, 2020
141e05e
removed inclujdes not longer required
May 23, 2020
e6cdc69
Added name into warning message
May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/ISOExtract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ enum errorcode ISOExtractClass::extractFiles(dirrec_struct *dirrec, uint32_t num
#endif

for (i = 0; i < numdirrec; i++)
{
{
bool mpegMultiplexDemux=false;
if (!(dirrec[i].FileFlags & ISOATTR_DIRECTORY))
{
Expand All @@ -558,7 +558,8 @@ enum errorcode ISOExtractClass::extractFiles(dirrec_struct *dirrec, uint32_t num
int trackindex=0;

// Check first sector to make sure it isn't a CDDA track
trackinfo_struct *track = FADToTrack((dirrec[i].LocationOfExtentL-cdinfo.trackinfo[trackindex].fileoffset / 2048)+150);
unsigned int fad = (dirrec[i].LocationOfExtentL - cdinfo.trackinfo[trackindex].fileoffset) / 2048;
trackinfo_struct *track = FADToTrack(fad+150);
if (track->type == TT_CDDA)
{
dirrec[i].XAAttributes.attributes = 0x4111;
Expand All @@ -576,12 +577,11 @@ enum errorcode ISOExtractClass::extractFiles(dirrec_struct *dirrec, uint32_t num
mpegMultiplexDemux = true;
#endif
}

if (dirrec[i].ParentRecord != 0xFFFFFFFF)
{
dirrec_struct *parent=&dirrec[dirrec[i].ParentRecord];
strcpy(filename3, (char *)dirrec[i].FileIdentifier);

for(;;)
{
sprintf(filename2, "%s%c%s", parent->FileIdentifier, FILE_SEPARATOR, filename3);
Expand Down Expand Up @@ -636,10 +636,13 @@ enum errorcode ISOExtractClass::extractFiles(dirrec_struct *dirrec, uint32_t num
{
if (detailedStatus)
printf("\r%s:(%ld/%ld)", dirrec[i].FileIdentifier, i2 / 2048, dirrec[i].DataLengthL / 2048);
if (!readUserSector(dirrec[i].LocationOfExtentL-cdinfo.trackinfo[trackindex].fileoffset + i2 / 2048, sector, &readsize, track, &sectorinfo))
int offset = dirrec[i].LocationOfExtentL - cdinfo.trackinfo[trackindex].fileoffset + (i2 / 2048);
if (!readUserSector(offset, sector, &readsize, track, &sectorinfo))
{
err = ERR_READ;
goto error;
printf("\nWARNING: Could not read User sector for file: %s SKIPPING\n\n", dirrec[i].FileIdentifier);
// err = ERR_READ;
// goto error;
break;
}

FILE *curOutput=NULL;
Expand Down