1.20 release

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

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index cdb69b7..d973805 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -424,8 +424,6 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
        dst[511-8] = 0;\r
        if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;\r
        if (ext) strcat(dst, ext);\r
-\r
-       printf("romfname_ext: %s\n", dst);\r
 }\r
 \r
 \r
@@ -973,9 +971,9 @@ void emu_forced_frame(void)
        PicoOpt = po_old;\r
 \r
        if (!(Pico.video.reg[12]&1)) {\r
-               vidCpyM2 = vidCpyM2_40col;\r
+               vidCpyM2 = vidCpyM2_32col;\r
                clearArea(1);\r
-       } else  vidCpyM2 = vidCpyM2_32col;\r
+       } else  vidCpyM2 = vidCpyM2_40col;\r
 \r
        vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
        vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
@@ -1369,8 +1367,10 @@ int emu_SaveLoadGame(int load, int sram)
        // make save filename\r
        saveFname = emu_GetSaveFName(load, sram, state_slot);\r
        if (saveFname == NULL) {\r
-               strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");\r
-               gettimeofday(&noticeMsgTime, 0);\r
+               if (!sram) {\r
+                       strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");\r
+                       gettimeofday(&noticeMsgTime, 0);\r
+               }\r
                return -1;\r
        }\r
 \r