X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=87a7c198c0849ca9be28eee37d78bb63634f4f21;hp=c82b6dafc9e6ab0e599ccbf9d3d6d07ed1801aba;hb=4955e9d068cd7cbb2bc8755d7bab09b78b92a981;hpb=a48ae3a7decaae1f0bbc45fb0ce37e030fd5357b

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index c82b6daf..87a7c198 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -709,11 +709,12 @@ void cdrInterrupt() {
 			Wild 9: skip PREGAP + starting accurate SubQ
 			- plays tracks without retry play
 			*/
+			/* unneeded with correct cdriso?
 			Set_Track();
+			*/
 			Find_CurTrack();
 			ReadTrack( cdr.SetSectorPlay );
 
-
 			// GameShark CD Player: Calls 2x + Play 2x
 			if( cdr.FastBackward || cdr.FastForward ) {
 				if( cdr.FastForward ) cdr.FastForward--;
@@ -1901,9 +1902,13 @@ void cdrWrite3(unsigned char rt) {
 		// - Final Fantasy Tactics
 		// - various other games
 
-		if (cdr.Irq) // rearmed guesswork hack
 		if (cdr.Reading && !cdr.ResultReady) {
-			CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime);
+			int left = psxRegs.intCycle[PSXINT_CDREAD].sCycle + psxRegs.intCycle[PSXINT_CDREAD].cycle - psxRegs.cycle;
+			int time = (cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime;
+			if (left < time / 2) { // rearmed guesswork hack
+				//printf("-- resched %d -> %d\n", left, time / 2);
+				CDREAD_INT(time / 2);
+			}
 		}
 
 		return;