X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Farea.c;h=b43a4d9e669df95201bcd58332065c0a3ab9433c;hb=0ace9b9aac5de8f1ee5bf181132f98a1f81f4a1d;hp=757d8fb999ad6fb28a1d39d8f060a106bc8e3e35;hpb=5e89f0f5aebedc086888415e063b9883fc4a9e92;p=picodrive.git diff --git a/pico/cd/area.c b/pico/cd/area.c index 757d8fb..b43a4d9 100644 --- a/pico/cd/area.c +++ b/pico/cd/area.c @@ -272,18 +272,10 @@ PICO_INTERNAL int PicoCdLoadState(void *file) readend: if (PicoAHW & PAHW_MCD) { - /* after load events */ - if (Pico_mcd->s68k_regs[3] & 4) // 1M mode? - wram_2M_to_1M(Pico_mcd->word_ram2M); - PicoMemRemapCD(Pico_mcd->s68k_regs[3]); -#ifdef _ASM_CD_MEMORY_C - if (Pico_mcd->s68k_regs[3] & 4) - PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]); -#endif + PicoMemStateLoaded(); + if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1)) cdda_start_play(); - // restore hint vector - *(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector; // must unpack after other CD stuff is loaded PicoAreaUnpackCpu(buff_s68k, 1);