strlwr_(ext);\r
}\r
\r
-char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };\r
-char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210" };\r
+char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };\r
+char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303" };\r
char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
\r
int emu_findBios(int region, char **bios_file)\r
free(movie_data);\r
movie_data = 0;\r
}\r
- if (!strcmp(ext, ".gmv")) {\r
+ if (!strcmp(ext, ".gmv"))\r
+ {\r
// check for both gmv and rom\r
int dummy;\r
FILE *movie_file = fopen(romFileName, "rb");\r
} else {\r
PicoRegionOverride = 4;\r
}\r
- PicoReset(0);\r
+ PicoReset();\r
// TODO: bits 6 & 5\r
}\r
movie_data[0x18+30] = 0;\r
}\r
\r
\r
+static void make_config_cfg(char *cfg)\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
+}\r
+\r
int emu_ReadConfig(int game, int no_defaults)\r
{\r
char cfg[512];\r
{\r
if (!no_defaults)\r
emu_setDefaultConfig();\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
ret = config_readsect(cfg, NULL);\r
}\r
else\r
else strcpy(cfg, "game.cfg");\r
\r
ret = -1;\r
- if (config_havesect(cfg, sect)) {\r
+ if (config_havesect(cfg, sect))\r
+ {\r
+ // read user's config\r
int vol = currentConfig.volume;\r
emu_setDefaultConfig();\r
ret = config_readsect(cfg, sect);\r
currentConfig.volume = vol; // make vol global (bah)\r
}\r
+ else\r
+ {\r
+ // read global config, and apply game_def.cfg on top\r
+ make_config_cfg(cfg);\r
+ config_readsect(cfg, NULL);\r
+ ret = config_readsect("game_def.cfg", sect);\r
+ }\r
\r
if (ret != 0)\r
{\r
- // fall back to old\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
PsndRate = currentConfig.s_PsndRate;\r
PicoRegionOverride = currentConfig.s_PicoRegion;\r
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
- PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
+ // PicoCDBuffers = currentConfig.s_PicoCDBuffers; // ignore in this case\r
}\r
}\r
else\r