add support for doublesized menu fonts

[libpicofe.git] / common / emu.c

diff --git a/common/emu.c b/common/emu.c
index f8b4e65..b03f8f8 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -129,9 +129,9 @@ int emu_findBios(int region, char **bios_file)
                if (bios_file) *bios_file = bios_path;\r
                return 1;\r
        } else {\r
-               sprintf(menuErrorMsg, "no %s BIOS files found, read docs",\r
+               sprintf(bios_path, "no %s BIOS files found, read docs",\r
                        region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-               lprintf("%s\n", menuErrorMsg);\r
+               me_update_msg(bios_path);\r
                return 0;\r
        }\r
 }\r
@@ -307,7 +307,7 @@ int emu_ReloadRom(char *rom_fname)
 \r
        // detect wrong extensions\r
        if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
-               sprintf(menuErrorMsg, "Not a ROM/CD selected.");\r
+               me_update_msg("Not a ROM/CD selected.");\r
                return 0;\r
        }\r
 \r
@@ -324,32 +324,32 @@ int emu_ReloadRom(char *rom_fname)
                int dummy;\r
                FILE *movie_file = fopen(rom_fname, "rb");\r
                if(!movie_file) {\r
-                       sprintf(menuErrorMsg, "Failed to open movie.");\r
+                       me_update_msg("Failed to open movie.");\r
                        return 0;\r
                }\r
                fseek(movie_file, 0, SEEK_END);\r
                movie_size = ftell(movie_file);\r
                fseek(movie_file, 0, SEEK_SET);\r
                if(movie_size < 64+3) {\r
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
+                       me_update_msg("Invalid GMV file.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
                movie_data = malloc(movie_size);\r
                if(movie_data == NULL) {\r
-                       sprintf(menuErrorMsg, "low memory.");\r
+                       me_update_msg("low memory.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
                fread(movie_data, 1, movie_size, movie_file);\r
                fclose(movie_file);\r
                if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
+                       me_update_msg("Invalid GMV file.");\r
                        return 0;\r
                }\r
                dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
                if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
+                       me_update_msg("Could't find a ROM for movie.");\r
                        return 0;\r
                }\r
                get_ext(rom_fname, ext);\r
@@ -361,7 +361,7 @@ int emu_ReloadRom(char *rom_fname)
                PicoPatchLoad(rom_fname);\r
                dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
                if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM to patch.");\r
+                       me_update_msg("Could't find a ROM to patch.");\r
                        return 0;\r
                }\r
                get_ext(rom_fname, ext);\r
@@ -401,12 +401,12 @@ int emu_ReloadRom(char *rom_fname)
 \r
        rom = pm_open(used_rom_name);\r
        if (!rom) {\r
-               sprintf(menuErrorMsg, "Failed to open ROM/CD image");\r
+               me_update_msg("Failed to open ROM/CD image");\r
                goto fail;\r
        }\r
 \r
        if (cd_state < 0) {\r
-               sprintf(menuErrorMsg, "Invalid CD image");\r
+               me_update_msg("Invalid CD image");\r
                goto fail;\r
        }\r
 \r
@@ -416,10 +416,9 @@ int emu_ReloadRom(char *rom_fname)
        rom_loaded = 0;\r
 \r
        if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
-               if      (ret == 2) sprintf(menuErrorMsg, "Out of memory");\r
-               else if (ret == 3) sprintf(menuErrorMsg, "Read failed");\r
-               else               sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
-               lprintf("%s\n", menuErrorMsg);\r
+               if      (ret == 2) me_update_msg("Out of memory");\r
+               else if (ret == 3) me_update_msg("Read failed");\r
+               else               me_update_msg("PicoCartLoad() failed.");\r
                goto fail2;\r
        }\r
        pm_close(rom);\r
@@ -429,7 +428,7 @@ int emu_ReloadRom(char *rom_fname)
        if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
          ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
                if (rom_data) free(rom_data);\r
-               sprintf(menuErrorMsg, "Not a ROM selected.");\r
+               me_update_msg("Not a ROM selected.");\r
                goto fail2;\r
        }\r
 \r
@@ -443,7 +442,7 @@ int emu_ReloadRom(char *rom_fname)
 \r
        lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
        if (PicoCartInsert(rom_data, rom_size)) {\r
-               sprintf(menuErrorMsg, "Failed to load ROM.");\r
+               me_update_msg("Failed to load ROM.");\r
                goto fail2;\r
        }\r
 \r
@@ -451,8 +450,7 @@ int emu_ReloadRom(char *rom_fname)
        if (cd_state != CIT_NOT_CD) {\r
                ret = Insert_CD(rom_fname, cd_state);\r
                if (ret != 0) {\r
-                       sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
-                       lprintf("%s\n", menuErrorMsg);\r
+                       me_update_msg("Insert_CD() failed, invalid CD image?");\r
                        goto fail2;\r
                }\r
        }\r