X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fstate.c;h=f4e685fb05e3946938e88e619c554fd71ac53049;hb=e42a47e2086e6512519dd86af420363498302f49;hp=94cefade85a0c0d76b20a7da2183649bf427aefa;hpb=3f23709ef37c5b3511c1445cbed7b447b56a37e0;p=picodrive.git

diff --git a/pico/state.c b/pico/state.c
index 94cefad..f4e685f 100644
--- a/pico/state.c
+++ b/pico/state.c
@@ -7,7 +7,7 @@
  */
 
 #include "pico_int.h"
-#include <zlib/zlib.h>
+#include <zlib.h>
 
 #include "../cpu/sh2/sh2.h"
 #include "sound/ym2612.h"
@@ -149,8 +149,8 @@ typedef enum {
   CHUNK_GA_REGS,
   CHUNK_PCM,
   CHUNK_CDC,     // old
-  CHUNK_CDD,     // 20
-  CHUNK_SCD,
+  CHUNK_CDD,     // 20 old
+  CHUNK_SCD,     // old
   CHUNK_RC,      // old
   CHUNK_MISC_CD,
   //
@@ -177,6 +177,7 @@ typedef enum {
   CHUNK_CD_EVT = 50,
   CHUNK_CD_GFX,
   CHUNK_CD_CDC,
+  CHUNK_CD_CDD,
   //
   CHUNK_DEFAULT_COUNT,
   CHUNK_CARTHW_ = CHUNK_CARTHW,  // 64 (defined in PicoInt)
@@ -317,8 +318,6 @@ static int state_save(void *file)
     CHECKED_WRITE_BUFF(CHUNK_BRAM,     Pico_mcd->bram);
     CHECKED_WRITE_BUFF(CHUNK_GA_REGS,  Pico_mcd->s68k_regs); // GA regs, not CPU regs
     CHECKED_WRITE_BUFF(CHUNK_PCM,      Pico_mcd->pcm);
-    CHECKED_WRITE_BUFF(CHUNK_CDD,      Pico_mcd->cdd);
-    CHECKED_WRITE_BUFF(CHUNK_SCD,      Pico_mcd->scd);
     CHECKED_WRITE_BUFF(CHUNK_MISC_CD,  Pico_mcd->m);
     memset(buff, 0, 0x40);
     memcpy(buff, pcd_event_times, sizeof(pcd_event_times));
@@ -328,6 +327,8 @@ static int state_save(void *file)
     CHECKED_WRITE(CHUNK_CD_GFX, len, buf2);
     len = cdc_context_save(buf2);
     CHECKED_WRITE(CHUNK_CD_CDC, len, buf2);
+    len = cdd_context_save(buf2);
+    CHECKED_WRITE(CHUNK_CD_CDD, len, buf2);
 
     if (Pico_mcd->s68k_regs[3] & 4) // convert back
       wram_2M_to_1M(Pico_mcd->word_ram2M);
@@ -498,8 +499,6 @@ static int state_load(void *file)
       case CHUNK_BRAM:     CHECKED_READ_BUFF(Pico_mcd->bram); break;
       case CHUNK_GA_REGS:  CHECKED_READ_BUFF(Pico_mcd->s68k_regs); break;
       case CHUNK_PCM:      CHECKED_READ_BUFF(Pico_mcd->pcm); break;
-      case CHUNK_CDD:      CHECKED_READ_BUFF(Pico_mcd->cdd); break;
-      case CHUNK_SCD:      CHECKED_READ_BUFF(Pico_mcd->scd); break;
       case CHUNK_MISC_CD:  CHECKED_READ_BUFF(Pico_mcd->m); break;
 
       case CHUNK_CD_EVT:
@@ -517,12 +516,22 @@ static int state_load(void *file)
         len_check = cdc_context_load(buf);
         break;
 
+      case CHUNK_CD_CDD:
+        CHECKED_READ_LIM(buf);
+        len_check = cdd_context_load(buf);
+        break;
+
       // old, to be removed:
       case CHUNK_CDC:
         CHECKED_READ_LIM(buf);
         cdc_context_load_old(buf);
         break;
 
+      case CHUNK_SCD:
+        CHECKED_READ_LIM(buf);
+        cdd_context_load_old(buf);
+        break;
+
       // 32x stuff
 #ifndef NO_32X
       case CHUNK_MSH2:
@@ -580,6 +589,9 @@ readend:
   if (PicoAHW & PAHW_32X)
     Pico32xStateLoaded(1);
 
+  if (PicoLoadStateHook != NULL)
+    PicoLoadStateHook();
+
   // must unpack 68k and z80 after banks are set up
   if (!(PicoAHW & PAHW_SMS))
     SekUnpackCpu(buff_m68k, 0);
@@ -596,9 +608,6 @@ readend:
   {
     SekCycleAimS68k = SekCycleCntS68k;
     pcd_state_loaded();
-
-    if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
-      cdda_start_play();
   }
 
   retval = 0;
@@ -677,9 +686,8 @@ static int pico_state_internal(void *afile, int is_save)
       ret = state_load_legacy(afile);
     }
 
-    if (PicoLoadStateHook != NULL)
-      PicoLoadStateHook();
     Pico.m.dirtyPal = 1;
+    Pico.video.status &= ~(SR_VB | SR_F);
   }
 
   return ret;