admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64 from hizzlekizzle/master

Browse Source 
add core option to enable/disable turbo buttons
This commit is contained in:
meepingsnesroms
2017-02-16 21:15:25 -08:00
committed by GitHub
parent 5a27aa3374 c2a21a1783
commit 82a1f59c78
1 changed files with 74 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/drivers/libretro/libretro.c
View File

@@ -42,6 +42,7 @@ static retro_environment_t environ_cb = NULL;
static bool use_overscan; static bool use_overscan;
static bool use_raw_palette; static bool use_raw_palette;
static bool use_par; static bool use_par;
int turbo_enabler;
/* emulator-specific variables */ /* emulator-specific variables */
@@ -682,6 +683,7 @@ void retro_set_environment(retro_environment_t cb)
{ "fceumm_nospritelimit", "No Sprite Limit; disabled|enabled" }, { "fceumm_nospritelimit", "No Sprite Limit; disabled|enabled" },
{ "fceumm_overclocking", "Overclocking; disabled|2x" }, { "fceumm_overclocking", "Overclocking; disabled|2x" },
{ "fceumm_overscan", "Crop Overscan; enabled|disabled" }, { "fceumm_overscan", "Crop Overscan; enabled|disabled" },
{ "fceumm_turbo_enable", "Turbo Enable; None|Player 1|Player 2|Both" },
{ "fceumm_aspect", "Preferred aspect ratio; 8:7 PAR|4:3" }, { "fceumm_aspect", "Preferred aspect ratio; 8:7 PAR|4:3" },
{ NULL, NULL }, { NULL, NULL },
}; };
@@ -941,6 +943,28 @@ static void check_variables(bool startup)
} }
} }
var.key = "fceumm_turbo_enable";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (!strcmp(var.value, "None"))
{
turbo_enabler = 0;
}
else if (!strcmp(var.value, "Player 1"))
{
turbo_enabler = 1;
}
else if (!strcmp(var.value, "Player 2"))
{
turbo_enabler = 2;
}
else if (!strcmp(var.value, "Both"))
{
turbo_enabler = 3;
}
}
var.key = "fceumm_aspect"; var.key = "fceumm_aspect";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -978,7 +1002,6 @@ unsigned char turbo_p1_toggle[] = {0,0};
* the slower the frequency i.e. wait time * the slower the frequency i.e. wait time
* between turbo repeats increases * between turbo repeats increases
*/ */
#define TURBO_DELAY 3 #define TURBO_DELAY 3
static void FCEUD_UpdateInput(void) static void FCEUD_UpdateInput(void)
@@ -1008,42 +1031,46 @@ static void FCEUD_UpdateInput(void)
* depending on whether the delay value has * depending on whether the delay value has
* been reached. * been reached.
*/ */
if (turbo_enabler == 1 || turbo_enabler == 3)
// Handle turbo buttons - player 1 {
for ( i = 8; i < 10; i++) { // Handle turbo buttons - player 1
if(input_cb(0, RETRO_DEVICE_JOYPAD, 0, bindmap[i].retro)) { for ( i = 8; i < 10; i++) {
if (turbo_p0_toggle[i-8] == 0) { if(input_cb(0, RETRO_DEVICE_JOYPAD, 0, bindmap[i].retro)) {
pad[0] |= bindmap[i].nes; if (turbo_p0_toggle[i-8] == 0) {
} pad[0] |= bindmap[i].nes;
turbo_p0_toggle[i-8]++; }
if (turbo_p0_toggle[i-8] > TURBO_DELAY) { turbo_p0_toggle[i-8]++;
// Reset the toggle if if (turbo_p0_toggle[i-8] > TURBO_DELAY) {
// delay value is reached // Reset the toggle if
turbo_p0_toggle[i-8] = 0; // delay value is reached
} turbo_p0_toggle[i-8] = 0;
} else { }
// If the button is not pressed, just reset the toggle } else {
turbo_p0_toggle[i-8] = 0; // If the button is not pressed, just reset the toggle
turbo_p0_toggle[i-8] = 0;
}
}
} }
} if (turbo_enabler == 2 || turbo_enabler == 3)
{
// Handle turbo buttons - player 2 // Handle turbo buttons - player 2
for ( i = 8; i < 10; i++) { for ( i = 8; i < 10; i++) {
if(input_cb(1, RETRO_DEVICE_JOYPAD, 0, bindmap[i].retro)) { if(input_cb(1, RETRO_DEVICE_JOYPAD, 0, bindmap[i].retro)) {
if (turbo_p1_toggle[i-8] == 0) { if (turbo_p1_toggle[i-8] == 0) {
pad[1] |= bindmap[i].nes; pad[1] |= bindmap[i].nes;
} }
turbo_p1_toggle[i-8]++; turbo_p1_toggle[i-8]++;
if (turbo_p1_toggle[i-8] > TURBO_DELAY) { if (turbo_p1_toggle[i-8] > TURBO_DELAY) {
// Reset the toggle if // Reset the toggle if
// delay value is reached // delay value is reached
turbo_p1_toggle[i-8] = 0; turbo_p1_toggle[i-8] = 0;
} }
} else { } else {
// If the button is not pressed, just reset the toggle // If the button is not pressed, just reset the toggle
turbo_p1_toggle[i-8] = 0; turbo_p1_toggle[i-8] = 0;
}
}
} }
}
JSReturn[0] = pad[0] | (pad[1] << 8); JSReturn[0] = pad[0] | (pad[1] << 8);