some skin adjustments

[picodrive.git] / Pico / cd / Area.c

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index 51da616..8100d36 100644 (file)
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -1,9 +1,5 @@
-// This is part of Pico Library
-
-// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+// Savestate handling for emulated Sega/Mega CD machine.
+// (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
 
 #include "../PicoInt.h"
@@ -243,7 +239,13 @@ 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);
+#ifdef _ASM_CD_MEMORY_C
+       PicoMemResetCD(Pico_mcd->s68k_regs[3]);
+       if (Pico_mcd->s68k_regs[3]&4)
+               PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
+#endif
+       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;