Skip to content

Commit

Permalink
libretro: add reload/next game (#1059)
Browse files Browse the repository at this point in the history
- Enable reload/next game option in Core options
- Map reload/next game action to X button
  • Loading branch information
jfroco authored Dec 18, 2024
1 parent 682cdb0 commit abb9232
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/os/libretro/libretro.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ static int stella_paddle_analog_sensitivity;
static int setting_crop_hoverscan, crop_left;
static NTSCFilter::Preset setting_filter;
static const char* setting_palette;
static int setting_reload;

static bool system_reset;

Expand Down Expand Up @@ -186,6 +187,8 @@ static void update_input()
MASK_EVENT(Event::ConsoleBlackWhite, 0, RETRO_DEVICE_ID_JOYPAD_R3);
MASK_EVENT(Event::ConsoleSelect, 0, RETRO_DEVICE_ID_JOYPAD_SELECT);
MASK_EVENT(Event::ConsoleReset, 0, RETRO_DEVICE_ID_JOYPAD_START);
if (setting_reload)
MASK_EVENT(Event::ReloadConsole, 0, RETRO_DEVICE_ID_JOYPAD_X);

#undef EVENT
#undef MASK_EVENT
Expand Down Expand Up @@ -387,6 +390,16 @@ static void update_variables(bool init = false)
}
}

RETRO_GET("stella_reload")
{
int value = 0;

if(!strcmp(var.value, "off")) value = 0;
else if(!strcmp(var.value, "on")) value = 1;

setting_reload = value;
}

if(!init && !system_reset)
{
crop_left = setting_crop_hoverscan ? (stella.getVideoZoom() == 2 ? 26 : 8) : 0;
Expand Down Expand Up @@ -517,6 +530,7 @@ void retro_set_environment(retro_environment_t cb)
{ "stella_phosphor_blend", "Phosphor blend %; 60|65|70|75|80|85|90|95|100|0|5|10|15|20|25|30|35|40|45|50|55" },
{ "stella_paddle_joypad_sensitivity", "Paddle joypad sensitivity; 3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|1|2" },
{ "stella_paddle_analog_sensitivity", "Paddle analog sensitivity; 20|21|22|23|24|25|26|27|28|29|30|0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19" },
{ "stella_reload", "Enable reload/next game; off|on" },
{ NULL, NULL },
};

Expand Down Expand Up @@ -570,6 +584,7 @@ bool retro_load_game(const struct retro_game_info *info)
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" },
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "Trigger" },
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "Fire" },
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "Reload/Next game" },
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "Booster" },

{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
Expand All @@ -587,6 +602,7 @@ bool retro_load_game(const struct retro_game_info *info)
{ 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" },
{ 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "Trigger" },
{ 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "Fire" },
{ 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "Reload/Next game" },
{ 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "Booster" },

{ 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
Expand Down

0 comments on commit abb9232

Please sign in to comment.