X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=76fd5456ef11b0746ff39dd383a904fad624e47a;hb=6e72fb4d1ce087965afb024ccaa747d9146af091;hp=5ffb7fa4dd7d82722312da7f70a2865a2a087664;hpb=4810ff9b810f9ae2b9bf511abe167278c957a6b2;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 5ffb7fa4..76fd5456 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -383,7 +383,7 @@ static void ReadTrack(const u8 *time) {
 
 	CDR_LOG("ReadTrack *** %02x:%02x:%02x\n", tmp[0], tmp[1], tmp[2]);
 
-	cdr.RErr = CDR_readTrack(tmp);
+	cdr.NoErr = CDR_readTrack(tmp);
 	memcpy(cdr.Prev, tmp, 3);
 
 	if (CheckSBI(time))
@@ -505,7 +505,6 @@ void cdrPlayInterrupt()
 		cdr.Seeked = SEEK_DONE;
 		if (cdr.Irq == 0) {
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			setIrq();
 		}
 
@@ -609,8 +608,10 @@ void cdrInterrupt() {
 		do_CdlPlay:
 		case CdlPlay:
 			StopCdda();
-			/* It would set it to SEEK_DONE*/
-			cdr.Seeked = SEEK_PENDING;
+			if (cdr.Seeked == SEEK_PENDING) {
+				// XXX: wrong, should seek instead..
+				cdr.Seeked = SEEK_DONE;
+			}
 
 			cdr.FastBackward = 0;
 			cdr.FastForward = 0;
@@ -677,7 +678,6 @@ void cdrInterrupt() {
 		case CdlForward:
 			// TODO: error 80 if stopped
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			// GameShark CD Player: Calls 2x + Play 2x
 			cdr.FastForward = 1;
 			cdr.FastBackward = 0;
@@ -702,7 +702,6 @@ void cdrInterrupt() {
 
 		case CdlStandby + 0x100:
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			break;
 
 		case CdlStop:
@@ -730,7 +729,6 @@ void cdrInterrupt() {
 			cdr.StatP &= ~STATUS_ROTATING;
 			cdr.Result[0] = cdr.StatP;
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			break;
 
 		case CdlPause:
@@ -766,7 +764,6 @@ void cdrInterrupt() {
 			cdr.StatP &= ~STATUS_READ;
 			cdr.Result[0] = cdr.StatP;
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			break;
 
 		case CdlReset:
@@ -779,7 +776,6 @@ void cdrInterrupt() {
 
 		case CdlReset + 0x100:
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			break;
 
 		case CdlMute:
@@ -816,9 +812,6 @@ void cdrInterrupt() {
 		case CdlGetlocP:
 			SetResultSize(8);
 			memcpy(&cdr.Result, &cdr.subq, 8);
-
-			if (!cdr.Play && !cdr.Reading)
-				cdr.Result[1] = 0; // HACK?
 			break;
 
 		case CdlReadT: // SetSession?
@@ -829,7 +822,6 @@ void cdrInterrupt() {
 
 		case CdlReadT + 0x100:
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			break;
 
 		case CdlGetTN:
@@ -929,7 +921,6 @@ void cdrInterrupt() {
 			/* This adds the string "PCSX" in Playstation bios boot screen */
 			memcpy((char *)&cdr.Result[4], "PCSX", 4);
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			break;
 
 		case CdlInit:
@@ -953,7 +944,6 @@ void cdrInterrupt() {
 
 		case CdlReadToc + 0x100:
 			cdr.Stat = Complete;
-			cdr.RErr = 1;
 			no_busy_error = 1;
 			break;
 
@@ -1153,9 +1143,9 @@ void cdrReadInterrupt() {
 
 	buf = CDR_getBuffer();
 	if (buf == NULL)
-		cdr.RErr = 0;
+		cdr.NoErr = 0;
 
-	if (cdr.RErr == 0) {
+	if (cdr.NoErr == 0) {
 		CDR_LOG_I("cdrReadInterrupt() Log: err\n");
 		memset(cdr.Transfer, 0, DATA_SIZE);
 		cdr.Stat = DiskError;
@@ -1188,6 +1178,19 @@ void cdrReadInterrupt() {
 			int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
 			if (!ret) {
 				cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo);
+				/*
+				 * Gameblabla -
+				 * This is a hack for Megaman X4, Castlevania etc...
+				 * that regressed from the new m_locationChanged and CDROM timings changes.
+				 * It is mostly noticeable in Castevania however and the stuttering can be very jarring.
+				 * 
+				 * According to PCSX redux authors, we shouldn't cause a location change if
+				 * the sector difference is too small. 
+				 * I attempted to go with that approach but came empty handed.
+				 * So for now, let's just set cdr.m_locationChanged to false when playing back any ADPCM samples.
+				 * This does not regress Crash Team Racing's intro at least.
+				*/
+				cdr.m_locationChanged = FALSE;
 				SPU_playADPCMchannel(&cdr.Xa);
 				cdr.FirstSector = 0;
 			}