if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
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);
int start_rotating = 0;
int error = 0;
int delay;
+ unsigned int seekTime = 0;
// Reschedule IRQ
if (cdr.Stat) {
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
// BIOS CD Player
case CdlReadN:
case CdlReadS:
if (cdr.SetlocPending) {
+ seekTime = abs(msf2sec(cdr.SetSectorPlay) - msf2sec(cdr.SetSector)) * (cdReadTime / 200);
+ if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
Find_CurTrack(cdr.SetSectorPlay);
// - fix cutscene speech (startup)
// ??? - use more accurate seek time later
- CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime * 1);
+ CDREAD_INT(((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime * 1) + seekTime);
} else {
cdr.StatP |= STATUS_READ;
cdr.StatP &= ~STATUS_SEEK;
cdr.Readed = 0;
- 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 (*)
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;