Merge pull request #61 from Tatsuya79/master

Add CD bios core option.
This commit is contained in:
Twinaphex 2017-07-13 01:51:03 +01:00 committed by GitHub
commit 48ac052f02
3 changed files with 18 additions and 1 deletions

View File

@ -1305,6 +1305,20 @@ static void check_variables(void)
old_cdimagecache = cdimage_cache;
}
var.key = "pce_fast_cdbios";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (strcmp(var.value, "System Card 3") == 0)
setting_pce_fast_cdbios = "syscard3.pce";
else if (strcmp(var.value, "System Card 2") == 0)
setting_pce_fast_cdbios = "syscard2.pce";
else if (strcmp(var.value, "System Card 1") == 0)
setting_pce_fast_cdbios = "syscard1.pce";
else if (strcmp(var.value, "Games Express") == 0)
setting_pce_fast_cdbios = "gexpress.pce";
}
var.key = "pce_nospritelimit";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@ -1805,6 +1819,7 @@ void retro_set_environment(retro_environment_t cb)
static const struct retro_variable vars[] = {
{ "pce_fast_cdimagecache", "CD Image Cache (Restart); disabled|enabled" },
{ "pce_fast_cdbios", "CD Bios (Restart); System Card 3|Games Express|System Card 1|System Card 2" },
{ "pce_nospritelimit", "No Sprite Limit (Restart); disabled|enabled" },
{ "pce_ocmultiplier", "CPU Overclock Multiplier (Restart); 1|2|3|4|5|6|7|8|9|10|20|30|40|50" },
{ "pce_hoverscan", "Horizontal Overscan (352 Width Mode Only); 352|300|302|304|306|308|310|312|314|316|318|320|322|324|326|328|330|332|334|336|338|340|342|344|346|348|350" },

View File

@ -30,6 +30,7 @@ int setting_pce_fast_cddavolume = 100;
int setting_pce_fast_adpcmvolume = 100;
int setting_pce_fast_cdpsgvolume = 100;
uint32_t setting_pce_fast_cdspeed = 1;
std::string setting_pce_fast_cdbios = "syscard3.pce";
uint64 MDFN_GetSettingUI(const char *name)
{
@ -103,7 +104,7 @@ extern std::string retro_base_name;
std::string MDFN_GetSettingS(const char *name)
{
if (!strcmp("pce_fast.cdbios", name))
return std::string("syscard3.pce");
return setting_pce_fast_cdbios;
/* FILESYS */
if (!strcmp("filesys.path_firmware", name))
return retro_base_directory;

View File

@ -12,6 +12,7 @@ extern int setting_pce_fast_cddavolume;
extern int setting_pce_fast_adpcmvolume;
extern int setting_pce_fast_cdpsgvolume;
extern uint32_t setting_pce_fast_cdspeed;
extern std::string setting_pce_fast_cdbios;
// This should assert() or something if the setting isn't found, since it would
// be a totally tubular error!