mirror of
https://github.com/libretro/beetle-pce-fast-libretro.git
synced 2024-11-26 17:40:40 +00:00
Merge pull request #145 from bslenul/master
Add "Disable Soft Reset" core option to FAST variant of the core.
This commit is contained in:
commit
40a42b7f43
12
libretro.cpp
12
libretro.cpp
@ -1182,6 +1182,7 @@ static void set_volume (uint32_t *ptr, unsigned number)
|
|||||||
static uint8_t input_type[MAX_PLAYERS] = {};
|
static uint8_t input_type[MAX_PLAYERS] = {};
|
||||||
static uint8_t input_buf[MAX_PLAYERS][5] = {};
|
static uint8_t input_buf[MAX_PLAYERS][5] = {};
|
||||||
static float mouse_sensitivity = 1.0f;
|
static float mouse_sensitivity = 1.0f;
|
||||||
|
static bool disable_softreset = false;
|
||||||
|
|
||||||
// Array to keep track of whether a given player's button is turbo
|
// Array to keep track of whether a given player's button is turbo
|
||||||
static int turbo_enable[MAX_PLAYERS][MAX_BUTTONS] = {};
|
static int turbo_enable[MAX_PLAYERS][MAX_BUTTONS] = {};
|
||||||
@ -1343,6 +1344,13 @@ static void check_variables(void)
|
|||||||
turbo_toggle_alt = false;
|
turbo_toggle_alt = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var.key = "pce_disable_softreset";
|
||||||
|
|
||||||
|
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||||
|
{
|
||||||
|
disable_softreset = (strcmp(var.value, "enabled") == 0);
|
||||||
|
}
|
||||||
|
|
||||||
var.key = "pce_mouse_sensitivity";
|
var.key = "pce_mouse_sensitivity";
|
||||||
|
|
||||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||||
@ -1518,6 +1526,10 @@ static void update_input(void)
|
|||||||
{
|
{
|
||||||
input_state |= input_state_cb(j, RETRO_DEVICE_JOYPAD, 0, map[i]) ? (1 << i) : 0;
|
input_state |= input_state_cb(j, RETRO_DEVICE_JOYPAD, 0, map[i]) ? (1 << i) : 0;
|
||||||
|
|
||||||
|
// disable soft reset
|
||||||
|
if (disable_softreset == true)
|
||||||
|
if ((input_state & 0xC) == 0xC) input_state &= ~0xC;
|
||||||
|
|
||||||
// handle turbo buttons
|
// handle turbo buttons
|
||||||
if (turbo_enable[j][i] == 1) // Check whether a given button is turbo-capable
|
if (turbo_enable[j][i] == 1) // Check whether a given button is turbo-capable
|
||||||
{
|
{
|
||||||
|
@ -217,6 +217,17 @@ struct retro_core_option_definition option_defs_us[] = {
|
|||||||
},
|
},
|
||||||
"242"
|
"242"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"pce_disable_softreset",
|
||||||
|
"Disable Soft Reset (RUN+SELECT)",
|
||||||
|
"If set, when RUN+SEL are pressed simultaneously, disable both buttons temporarily.",
|
||||||
|
{
|
||||||
|
{ "disabled", NULL },
|
||||||
|
{ "enabled", NULL },
|
||||||
|
{ NULL, NULL },
|
||||||
|
},
|
||||||
|
"disabled"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"pce_cddavolume",
|
"pce_cddavolume",
|
||||||
"(CD) CDDA Volume %",
|
"(CD) CDDA Volume %",
|
||||||
|
Loading…
Reference in New Issue
Block a user