#include "fonts.h"\r
#include "lprintf.h"\r
#include "config.h"\r
+#include "common.h"\r
+#include "plat.h"\r
\r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
-#include <Pico/cd/cue.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
+#include <pico/cd/cue.h>\r
#include <zlib/zlib.h>\r
\r
-#if defined(__GP2X__)\r
- #include "../gp2x/gp2x.h"\r
- #define SCREEN_WIDTH 320\r
- #define SCREEN_BUFFER gp2x_screen\r
-#elif defined(__GIZ__)\r
- #include "../gizmondo/giz.h"\r
- #define SCREEN_WIDTH 321\r
- #define SCREEN_BUFFER giz_screen\r
-#elif defined(PSP)\r
- #include "../psp/psp.h"\r
- #define SCREEN_WIDTH 512\r
- #define SCREEN_BUFFER psp_screen\r
+\r
+void *g_screen_ptr;\r
+\r
+#if !SCREEN_SIZE_FIXED\r
+int g_screen_width = SCREEN_WIDTH;\r
+int g_screen_height = SCREEN_HEIGHT;\r
#endif\r
\r
char *PicoConfigFile = "config.cfg";\r
currentConfig_t currentConfig, defaultConfig;\r
-int rom_loaded = 0;\r
-char noticeMsg[64];\r
+char noticeMsg[64] = { 0, };\r
int state_slot = 0;\r
int config_slot = 0, config_slot_current = 0;\r
-char lastRomFile[512];\r
int kb_combo_keys = 0, kb_combo_acts = 0; // keys and actions which need button combos\r
int pico_inp_mode = 0;\r
+int engineState = PGS_Menu;\r
+\r
+/* TODO: len checking */\r
+char rom_fname_reload[512] = { 0, };\r
+char rom_fname_loaded[512] = { 0, };\r
+int rom_loaded = 0;\r
\r
unsigned char *movie_data = NULL;\r
static int movie_size = 0;\r
\r
-// provided by platform code:\r
-extern char romFileName[];\r
-extern void emu_noticeMsgUpdated(void);\r
-extern void emu_getMainDir(char *dst, int len);\r
-extern void emu_setDefaultConfig(void);\r
-extern void menu_romload_prepare(const char *rom_name);\r
-extern void menu_romload_end(void);\r
-\r
\r
// utilities\r
-static void strlwr_(char* string)\r
+static void strlwr_(char *string)\r
{\r
- while ( (*string++ = (char)tolower(*string)) );\r
+ char *p;\r
+ for (p = string; *p; p++)\r
+ *p = (char)tolower(*p);\r
}\r
\r
-static int try_rfn_cut(void)\r
+static int try_rfn_cut(char *fname)\r
{\r
FILE *tmp;\r
char *p;\r
\r
- p = romFileName + strlen(romFileName) - 1;\r
- for (; p > romFileName; p--)\r
+ p = fname + strlen(fname) - 1;\r
+ for (; p > fname; p--)\r
if (*p == '.') break;\r
*p = 0;\r
\r
- if((tmp = fopen(romFileName, "rb"))) {\r
+ if((tmp = fopen(fname, "rb"))) {\r
fclose(tmp);\r
return 1;\r
}\r
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
\r
static unsigned char id_header[0x100];\r
\r
-/* checks if romFileName points to valid MegaCD image\r
+/* checks if fname points to valid MegaCD image\r
* if so, checks for suitable BIOS */\r
-int emu_cdCheck(int *pregion)\r
+int emu_cdCheck(int *pregion, char *fname_in)\r
{\r
unsigned char buf[32];\r
pm_file *cd_f;\r
int region = 4; // 1: Japan, 4: US, 8: Europe\r
- char ext[5], *fname = romFileName;\r
+ char ext[5], *fname = fname_in;\r
cue_track_type type = CT_UNKNOWN;\r
cue_data_t *cue_data = NULL;\r
\r
- get_ext(romFileName, ext);\r
+ get_ext(fname_in, ext);\r
if (strcasecmp(ext, ".cue") == 0) {\r
- cue_data = cue_parse(romFileName);\r
+ cue_data = cue_parse(fname_in);\r
if (cue_data != NULL) {\r
fname = cue_data->tracks[1].fname;\r
type = cue_data->tracks[1].type;\r
}\r
+ else\r
+ return -1;\r
}\r
\r
cd_f = pm_open(fname);\r
if (cue_data != NULL)\r
cue_destroy(cue_data);\r
\r
- if (!cd_f) return 0; // let the upper level handle this\r
+ if (cd_f == NULL) return 0; // let the upper level handle this\r
\r
if (pm_read(buf, 32, cd_f) != 32) {\r
pm_close(cd_f);\r
- return 0;\r
+ return -1;\r
}\r
\r
if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) {\r
\r
char *emu_makeRomId(void)\r
{\r
- static char id_string[3+0x11+0x11+0x30+16];\r
+ static char id_string[3+0xe*3+0x3*3+0x30*3+3];\r
int pos, swab = 1;\r
\r
if (PicoAHW & PAHW_MCD) {\r
return id_string;\r
}\r
\r
-int emu_ReloadRom(void)\r
+// buffer must be at least 150 byte long\r
+void emu_getGameName(char *str150)\r
+{\r
+ int ret, swab = (PicoAHW & PAHW_MCD) ? 0 : 1;\r
+ char *s, *d;\r
+\r
+ ret = extract_text(str150, id_header + 0x50, 0x30, swab); // overseas name\r
+\r
+ for (s = d = str150 + 1; s < str150+ret; s++)\r
+ {\r
+ if (*s == 0) break;\r
+ if (*s != ' ' || d[-1] != ' ')\r
+ *d++ = *s;\r
+ }\r
+ *d = 0;\r
+}\r
+\r
+// note: this function might mangle rom_fname\r
+int emu_ReloadRom(char *rom_fname)\r
{\r
unsigned int rom_size = 0;\r
- char *used_rom_name = romFileName;\r
+ char *used_rom_name = rom_fname;\r
unsigned char *rom_data = NULL;\r
char ext[5];\r
- pm_file *rom;\r
+ pm_file *rom = NULL;\r
int ret, cd_state, cd_region, cfg_loaded = 0;\r
\r
- lprintf("emu_ReloadRom(%s)\n", romFileName);\r
+ lprintf("emu_ReloadRom(%s)\n", rom_fname);\r
\r
- get_ext(romFileName, ext);\r
+ get_ext(rom_fname, ext);\r
\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 selected.");\r
+ me_update_msg("Not a ROM/CD selected.");\r
return 0;\r
}\r
\r
{\r
// check for both gmv and rom\r
int dummy;\r
- FILE *movie_file = fopen(romFileName, "rb");\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() || try_rfn_cut();\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(romFileName, ext);\r
+ get_ext(rom_fname, ext);\r
+ lprintf("gmv loaded for %s\n", rom_fname);\r
}\r
- else if (!strcmp(ext, ".pat")) {\r
+ else if (!strcmp(ext, ".pat"))\r
+ {\r
int dummy;\r
- PicoPatchLoad(romFileName);\r
- dummy = try_rfn_cut() || try_rfn_cut();\r
+ 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(romFileName, ext);\r
+ get_ext(rom_fname, ext);\r
}\r
\r
- if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)\r
- Stop_CD();\r
+ emu_shutdownMCD();\r
\r
// check for MegaCD image\r
- cd_state = emu_cdCheck(&cd_region);\r
- if (cd_state != CIT_NOT_CD)\r
+ cd_state = emu_cdCheck(&cd_region, rom_fname);\r
+ if (cd_state >= 0 && cd_state != CIT_NOT_CD)\r
{\r
PicoAHW |= PAHW_MCD;\r
// valid CD image, check for BIOS..\r
\r
rom = pm_open(used_rom_name);\r
if (!rom) {\r
- sprintf(menuErrorMsg, "Failed to open rom.");\r
- return 0;\r
+ me_update_msg("Failed to open ROM/CD image");\r
+ goto fail;\r
+ }\r
+\r
+ if (cd_state < 0) {\r
+ me_update_msg("Invalid CD image");\r
+ goto fail;\r
}\r
\r
menu_romload_prepare(used_rom_name); // also CD load\r
rom_loaded = 0;\r
\r
if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
- sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
- lprintf("%s\n", menuErrorMsg);\r
- pm_close(rom);\r
- menu_romload_end();\r
- return 0;\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
+ rom = NULL;\r
\r
// detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
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
- menu_romload_end();\r
- return 0;\r
+ me_update_msg("Not a ROM selected.");\r
+ goto fail2;\r
}\r
\r
// load config for this ROM (do this before insert to get correct region)\r
\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
- menu_romload_end();\r
- return 0;\r
+ me_update_msg("Failed to load ROM.");\r
+ goto fail2;\r
}\r
\r
// insert CD if it was detected\r
if (cd_state != CIT_NOT_CD) {\r
- ret = Insert_CD(romFileName, cd_state);\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
- menu_romload_end();\r
- return 0;\r
+ me_update_msg("Insert_CD() failed, invalid CD image?");\r
+ goto fail2;\r
}\r
}\r
\r
}\r
\r
// additional movie stuff\r
- if (movie_data) {\r
- if(movie_data[0x14] == '6')\r
+ if (movie_data)\r
+ {\r
+ if (movie_data[0x14] == '6')\r
PicoOpt |= POPT_6BTN_PAD; // 6 button pad\r
else PicoOpt &= ~POPT_6BTN_PAD;\r
PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing\r
- if(movie_data[0xF] >= 'A') {\r
- if(movie_data[0x16] & 0x80) {\r
+ if (movie_data[0xF] >= 'A') {\r
+ if (movie_data[0x16] & 0x80) {\r
PicoRegionOverride = 8;\r
} else {\r
PicoRegionOverride = 4;\r
else\r
{\r
PicoOpt &= ~POPT_DIS_VDP_FIFO;\r
- if(Pico.m.pal) {\r
+ if (Pico.m.pal) {\r
strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");\r
} else {\r
strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS");\r
emu_noticeMsgUpdated();\r
\r
// load SRAM for this ROM\r
- if (currentConfig.EmuOpt & 1)\r
+ if (currentConfig.EmuOpt & EOPT_USE_SRAM)\r
emu_SaveLoadGame(1, 1);\r
\r
- strncpy(lastRomFile, romFileName, sizeof(lastRomFile)-1);\r
- lastRomFile[sizeof(lastRomFile)-1] = 0;\r
+ strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
+ rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
rom_loaded = 1;\r
return 1;\r
+\r
+fail2:\r
+ menu_romload_end();\r
+fail:\r
+ if (rom != NULL) pm_close(rom);\r
+ return 0;\r
}\r
\r
\r
+void emu_shutdownMCD(void)\r
+{\r
+ if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)\r
+ Stop_CD();\r
+ PicoAHW &= ~PAHW_MCD;\r
+}\r
+\r
static void romfname_ext(char *dst, const char *prefix, const char *ext)\r
{\r
char *p;\r
int prefix_len = 0;\r
\r
// make save filename\r
- for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;\r
+ p = rom_fname_loaded + strlen(rom_fname_loaded) - 1;\r
+ for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++;\r
*dst = 0;\r
if (prefix) {\r
- strcpy(dst, prefix);\r
- prefix_len = strlen(prefix);\r
+ int len = emu_getMainDir(dst, 512);\r
+ strcpy(dst + len, prefix);\r
+ prefix_len = len + strlen(prefix);\r
}\r
+#ifdef UIQ3\r
+ else p = rom_fname_loaded; // backward compatibility\r
+#endif\r
strncpy(dst + prefix_len, p, 511-prefix_len);\r
dst[511-8] = 0;\r
if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;\r
\r
static void make_config_cfg(char *cfg)\r
{\r
- strncpy(cfg, PicoConfigFile, 511);\r
+ int len;\r
+ len = emu_getMainDir(cfg, 512);\r
+ strncpy(cfg + len, PicoConfigFile, 512-6-1-len);\r
if (config_slot != 0)\r
{\r
char *p = strrchr(cfg, '.');\r
cfg[511] = 0;\r
}\r
\r
+void emu_packConfig(void)\r
+{\r
+ currentConfig.s_PicoOpt = PicoOpt;\r
+ currentConfig.s_PsndRate = PsndRate;\r
+ currentConfig.s_PicoRegion = PicoRegionOverride;\r
+ currentConfig.s_PicoAutoRgnOrder = PicoAutoRgnOrder;\r
+ currentConfig.s_PicoCDBuffers = PicoCDBuffers;\r
+}\r
+\r
+void emu_unpackConfig(void)\r
+{\r
+ PicoOpt = currentConfig.s_PicoOpt;\r
+ PsndRate = currentConfig.s_PsndRate;\r
+ PicoRegionOverride = currentConfig.s_PicoRegion;\r
+ PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
+ PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
+}\r
+\r
+static void emu_setDefaultConfig(void)\r
+{\r
+ memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));\r
+ emu_unpackConfig();\r
+}\r
+\r
+\r
int emu_ReadConfig(int game, int no_defaults)\r
{\r
char cfg[512];\r
- FILE *f;\r
int ret;\r
\r
if (!game)\r
ret = config_readsect("game_def.cfg", sect);\r
}\r
\r
- if (ret != 0)\r
- {\r
- // fall back to old game specific cfg\r
- char extbuf[16];\r
- if (config_slot != 0)\r
- sprintf(extbuf, ".%i.pbcfg", config_slot);\r
- else strcpy(extbuf, ".pbcfg");\r
- romfname_ext(cfg, "cfg/", extbuf);\r
- f = fopen(cfg, "rb");\r
- if (!f) {\r
- romfname_ext(cfg, NULL, ".pbcfg");\r
- f = fopen(cfg, "rb");\r
- }\r
- if (f) {\r
- int bread;\r
- fseek(f, 512, SEEK_SET); // skip unused lrom buffer\r
- bread = fread(¤tConfig, 1, sizeof(currentConfig), f);\r
- lprintf("emu_ReadConfig: %s %s\n", cfg, bread > 0 ? "(ok)" : "(failed)");\r
- fclose(f);\r
- ret = 0;\r
- }\r
-\r
- if (ret == 0) {\r
- PicoOpt = currentConfig.s_PicoOpt;\r
- PsndRate = currentConfig.s_PsndRate;\r
- PicoRegionOverride = currentConfig.s_PicoRegion;\r
- PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
- // PicoCDBuffers = currentConfig.s_PicoCDBuffers; // ignore in this case\r
- }\r
- }\r
- else\r
+ if (ret == 0)\r
{\r
lprintf("loaded cfg from sect \"%s\"\n", sect);\r
}\r
\r
if (!is_game)\r
{\r
- strncpy(cfg, PicoConfigFile, 511);\r
- if (config_slot != 0)\r
- {\r
- char *p = strrchr(cfg, '.');\r
- if (p == NULL) p = cfg + strlen(cfg);\r
- sprintf(p, ".%i.cfg", config_slot);\r
- }\r
- cfg[511] = 0;\r
+ make_config_cfg(cfg);\r
write_lrom = 1;\r
} else {\r
if (config_slot != 0)\r
}\r
\r
\r
-void emu_textOut8(int x, int y, const char *text)\r
+void emu_writelrom(void)\r
{\r
- int i,l,len=strlen(text);\r
- unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+ char cfg[512];\r
+ make_config_cfg(cfg);\r
+ config_writelrom(cfg);\r
+#ifndef NO_SYNC\r
+ sync();\r
+#endif\r
+}\r
\r
- /* always using built-in font */\r
- for (i = 0; i < len; i++)\r
- {\r
- for (l=0;l<8;l++)\r
- {\r
- unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
- if (fd&0x80) screen[l*SCREEN_WIDTH+0]=0xf0;\r
- if (fd&0x40) screen[l*SCREEN_WIDTH+1]=0xf0;\r
- if (fd&0x20) screen[l*SCREEN_WIDTH+2]=0xf0;\r
- if (fd&0x10) screen[l*SCREEN_WIDTH+3]=0xf0;\r
- if (fd&0x08) screen[l*SCREEN_WIDTH+4]=0xf0;\r
- if (fd&0x04) screen[l*SCREEN_WIDTH+5]=0xf0;\r
- if (fd&0x02) screen[l*SCREEN_WIDTH+6]=0xf0;\r
- if (fd&0x01) screen[l*SCREEN_WIDTH+7]=0xf0;\r
- }\r
- screen += 8;\r
- }\r
+/* always using built-in font */\r
+\r
+#define mk_text_out(name, type, val) \\r
+void name(int x, int y, const char *text) \\r
+{ \\r
+ int i, l, len = strlen(text); \\r
+ type *screen = (type *)g_screen_ptr + x + y * g_screen_width; \\r
+ \\r
+ for (i = 0; i < len; i++, screen += 8) \\r
+ { \\r
+ for (l = 0; l < 8; l++) \\r
+ { \\r
+ unsigned char fd = fontdata8x8[text[i] * 8 + l];\\r
+ type *s = screen + l * g_screen_width; \\r
+ if (fd&0x80) s[0] = val; \\r
+ if (fd&0x40) s[1] = val; \\r
+ if (fd&0x20) s[2] = val; \\r
+ if (fd&0x10) s[3] = val; \\r
+ if (fd&0x08) s[4] = val; \\r
+ if (fd&0x04) s[5] = val; \\r
+ if (fd&0x02) s[6] = val; \\r
+ if (fd&0x01) s[7] = val; \\r
+ } \\r
+ } \\r
}\r
\r
-void emu_textOut16(int x, int y, const char *text)\r
-{\r
- int i,l,len=strlen(text);\r
- unsigned short *screen = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+mk_text_out(emu_textOut8, unsigned char, 0xf0)\r
+mk_text_out(emu_textOut16, unsigned short, 0xffff)\r
\r
- for (i = 0; i < len; i++)\r
- {\r
- for (l=0;l<8;l++)\r
- {\r
- unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
- if(fd&0x80) screen[l*SCREEN_WIDTH+0]=0xffff;\r
- if(fd&0x40) screen[l*SCREEN_WIDTH+1]=0xffff;\r
- if(fd&0x20) screen[l*SCREEN_WIDTH+2]=0xffff;\r
- if(fd&0x10) screen[l*SCREEN_WIDTH+3]=0xffff;\r
- if(fd&0x08) screen[l*SCREEN_WIDTH+4]=0xffff;\r
- if(fd&0x04) screen[l*SCREEN_WIDTH+5]=0xffff;\r
- if(fd&0x02) screen[l*SCREEN_WIDTH+6]=0xffff;\r
- if(fd&0x01) screen[l*SCREEN_WIDTH+7]=0xffff;\r
- }\r
- screen += 8;\r
- }\r
-}\r
+#undef mk_text_out\r
\r
#ifdef PSP\r
#define MAX_COMBO_KEY 23\r
#define MAX_COMBO_KEY 31\r
#endif\r
\r
+// FIXME\r
void emu_findKeyBindCombos(void)\r
{\r
int act, u;\r
} else {\r
// MXYZ SACB RLDU\r
PicoPad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU\r
- if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // A\r
- if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // B\r
- if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // A\r
+ if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // C\r
+ if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // A\r
+ if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // B\r
PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
- if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A\r
- if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B\r
- if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A\r
+ if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // C\r
+ if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // A\r
+ if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // B\r
PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X\r
if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z\r
\r
if (is_sram)\r
{\r
- romfname_ext(saveFname, (PicoAHW&1) ? "brm/" : "srm/", (PicoAHW&1) ? ".brm" : ".srm");\r
+ romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm");\r
if (load) {\r
if (try_ropen_file(saveFname)) return saveFname;\r
// try in current dir..\r
{\r
ext[0] = 0;\r
if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
- strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");\r
+ strcat(ext, (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds.gz" : ".mds");\r
\r
- romfname_ext(saveFname, "mds/", ext);\r
+ romfname_ext(saveFname, "mds" PATH_SEP, ext);\r
if (load) {\r
if (try_ropen_file(saveFname)) return saveFname;\r
romfname_ext(saveFname, NULL, ext);\r
if (try_ropen_file(saveFname)) return saveFname;\r
- if (currentConfig.EmuOpt & 8) {\r
+ // no gzipped states, search for non-gzipped\r
+ if (currentConfig.EmuOpt & EOPT_GZIP_SAVES)\r
+ {\r
ext[0] = 0;\r
if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
strcat(ext, ".mds");\r
\r
- romfname_ext(saveFname, "mds/", ext);\r
+ romfname_ext(saveFname, "mds"PATH_SEP, ext);\r
if (try_ropen_file(saveFname)) return saveFname;\r
romfname_ext(saveFname, NULL, ext);\r
if (try_ropen_file(saveFname)) return saveFname;\r
notaz.gp2x.de / libpicofe.git / blobdiff