X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FArea.c;h=bfc1ffa5ca8cf3cd05d1fac4764746660dbd6f49;hb=83bd0b76aba19ff62368cfee76089e15579e3b7c;hp=073033f0277fc771d33b68464527e02f5100daf3;hpb=fa1e5e2948e9b06dec3353081081173f7ae4d742;p=picodrive.git

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index 073033f..bfc1ffa 100644
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -243,10 +243,45 @@ int PicoCdLoadState(void *file)
 	/* after load events */
 	if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
 		wram_2M_to_1M(Pico_mcd->word_ram2M);
-	mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+	if (Pico_mcd->m.audio_track > 0 && Pico_mcd->m.audio_track < Pico_mcd->TOC.Last_Track)
+		mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
 	// restore hint vector
         *(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
 
 	return 0;
 }
 
+
+int PicoCdLoadStateGfx(void *file)
+{
+	int ver, len, found = 0;
+	char buff[8];
+
+	g_read_offs = 0;
+	CHECKED_READ(8, buff);
+	if (strncmp(buff, "PicoSMCD", 8)) R_ERROR_RETURN("bad header");
+	CHECKED_READ(4, &ver);
+
+	while (!areaEof(file) && found < 4)
+	{
+		CHECKED_READ(1, buff);
+		CHECKED_READ(4, &len);
+		if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");
+		if (buff[0] > CHUNK_FM && !(PicoMCD & 1)) R_ERROR_RETURN("cd chunk in non CD state?");
+
+		switch (buff[0])
+		{
+			case CHUNK_VRAM:  CHECKED_READ_BUFF(Pico.vram);  found++; break;
+			case CHUNK_CRAM:  CHECKED_READ_BUFF(Pico.cram);  found++; break;
+			case CHUNK_VSRAM: CHECKED_READ_BUFF(Pico.vsram); found++; break;
+			case CHUNK_VIDEO: CHECKED_READ_BUFF(Pico.video); found++; break;
+			default:
+				areaSeek(file, len, SEEK_CUR);
+				break;
+		}
+	}
+
+	return 0;
+}
+
+