Upstreamed changes from PCSX Redux as seen here :
https://github.com/grumpycoders/pcsx-redux/commit/
5730e04f0183f37038bc1d133cf9f9092425b90a
This apparently fixes Deus Fight in Xenogears.
Co-authored-by: Nicolas Noble <nicolasnoble@users.noreply.github.com>
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
Find_CurTrack(cdr.SetSectorPlay);
ReadTrack(cdr.SetSectorPlay);
}
Find_CurTrack(cdr.SetSectorPlay);
ReadTrack(cdr.SetSectorPlay);
- CDRMISC_INT(cdReadTime);
+ if (cdr.m_locationChanged)
+ {
+ CDRMISC_INT(cdReadTime * 30);
+ cdr.m_locationChanged = FALSE;
+ }
+ else
+ {
+ CDRMISC_INT(cdReadTime);
+ }
// update for CdlGetlocP/autopause
generate_subq(cdr.SetSectorPlay);
// update for CdlGetlocP/autopause
generate_subq(cdr.SetSectorPlay);
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
Find_CurTrack(cdr.SetSectorPlay);
}
Find_CurTrack(cdr.SetSectorPlay);
- CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime);
+ uint32_t delay = (cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime;
+ if (cdr.m_locationChanged) {
+ CDREAD_INT(delay * 30);
+ cdr.m_locationChanged = FALSE;
+ } else {
+ CDREAD_INT(delay);
+ }
/*
Croc 2: $40 - only FORM1 (*)
/*
Croc 2: $40 - only FORM1 (*)
cdr.DriveState = DRIVESTATE_STANDBY;
cdr.StatP = STATUS_ROTATING;
pTransfer = cdr.Transfer;
cdr.DriveState = DRIVESTATE_STANDBY;
cdr.StatP = STATUS_ROTATING;
pTransfer = cdr.Transfer;
+ cdr.SetlocPending = 0;
+ cdr.m_locationChanged = FALSE;
// BIOS player - default values
cdr.AttenuatorLeftToLeft = 0x80;
// BIOS player - default values
cdr.AttenuatorLeftToLeft = 0x80;
unsigned char SetSector[4];
unsigned char Track;
boolean Play, Muted;
unsigned char SetSector[4];
unsigned char Track;
boolean Play, Muted;
+ boolean m_locationChanged;
int CurTrack;
int Mode, File, Channel;
int Reset;
int CurTrack;
int Mode, File, Channel;
int Reset;