Merge branch 'libretro' into libretro-reset

[picodrive.git] / platform / common / emu.c

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 0a1b59c..85e1ba7 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -889,20 +889,20 @@ int emu_save_load_game(int load, int sram)
                {\r
                        if (PicoOpt & POPT_EN_MCD_RAMCART) {\r
                                sram_size = 0x12000;\r
-                               sram_data = SRam.data;\r
+                               sram_data = Pico.sv.data;\r
                                if (sram_data)\r
-                                       memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);\r
+                                       memcpy(sram_data, Pico_mcd->bram, 0x2000);\r
                        } else {\r
                                sram_size = 0x2000;\r
                                sram_data = Pico_mcd->bram;\r
                                truncate  = 0; // the .brm may contain RAM cart data after normal brm\r
                        }\r
                } else {\r
-                       sram_size = SRam.size;\r
-                       sram_data = SRam.data;\r
+                       sram_size = Pico.sv.size;\r
+                       sram_data = Pico.sv.data;\r
                }\r
                if (sram_data == NULL)\r
-                       return 0; // SRam forcefully disabled for this game\r
+                       return 0; // cart saves forcefully disabled for this game\r
 \r
                if (load)\r
                {\r
@@ -913,7 +913,7 @@ int emu_save_load_game(int load, int sram)
                        ret = ret > 0 ? 0 : -1;\r
                        fclose(sramFile);\r
                        if ((PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_RAMCART))\r
-                               memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\r
+                               memcpy(Pico_mcd->bram, sram_data, 0x2000);\r
                } else {\r
                        // sram save needs some special processing\r
                        // see if we have anything to save\r
@@ -1141,6 +1141,8 @@ static void run_events_ui(unsigned int which)
                emu_status_msg("SAVE SLOT %i [%s]", state_slot,\r
                        emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");\r
        }\r
+       if (which & PEV_RESET)\r
+               emu_reset_game();\r
        if (which & PEV_MENU)\r
                engineState = PGS_Menu;\r
 }\r
@@ -1260,9 +1262,9 @@ void emu_init(void)
 void emu_finish(void)\r
 {\r
        // save SRAM\r
-       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
+       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {\r
                emu_save_load_game(0, 1);\r
-               SRam.changed = 0;\r
+               Pico.sv.changed = 0;\r
        }\r
 \r
        if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) {\r
@@ -1512,10 +1514,10 @@ void emu_loop(void)
        emu_set_fastforward(0);\r
 \r
        // save SRAM\r
-       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
+       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {\r
                plat_status_msg_busy_first("Writing SRAM/BRAM...");\r
                emu_save_load_game(0, 1);\r
-               SRam.changed = 0;\r
+               Pico.sv.changed = 0;\r
        }\r
 \r
        pemu_loop_end();\r