update platform code to suit recent PCSX related changes

[libpicofe.git] / common / emu.c

diff --git a/common/emu.c b/common/emu.c
index 822d7aa..235861b 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -497,11 +497,13 @@ int emu_reload_rom(char *rom_fname)
 \r
        get_ext(rom_fname, ext);\r
 \r
-       // check for movie file\r
+       // early cleanup\r
+       PicoPatchUnload();\r
        if (movie_data) {\r
                free(movie_data);\r
                movie_data = 0;\r
        }\r
+\r
        if (!strcmp(ext, ".gmv"))\r
        {\r
                // check for both gmv and rom\r
@@ -558,7 +560,6 @@ int emu_reload_rom(char *rom_fname)
        }\r
 \r
        shutdown_MCD();\r
-       PicoPatchUnload();\r
        PicoCartUnload();\r
        rom_loaded = 0;\r
 \r
@@ -1356,6 +1357,7 @@ void emu_cmn_forced_frame(int no_scale, int do_emu)
 \r
        memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
 \r
+       PicoOpt &= ~POPT_ALT_RENDERER;\r
        PicoOpt |= POPT_ACC_SPRITES;\r
        if (!no_scale)\r
                PicoOpt |= POPT_EN_SOFTSCALE;\r