Skip to content

Add new dual controller core option for games like Night Stalker and AD&D #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msheehan79 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add new dual controller core option for games like Night Stalker and AD&D #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions src/libretro.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,7 @@ bool paused = false;
bool keyboardChange = false;
bool keyboardDown = false;
int keyboardState = 0;
static bool dual_controllers = false;

// at 44.1khz, read 735 samples (44100/60)
// at 48khz, read 800 samples (48000/60)
Expand Down Expand Up @@ -1029,8 +1030,13 @@ static void update_input(void)

joypad0[14] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X);
joypad0[15] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y);
joypad0[16] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X);
joypad0[17] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y);

// If we have enabled the Dual Controller option, the Keypad right stick inputs will come from Controller 2
if (!dual_controllers)
{
joypad0[16] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X);
joypad0[17] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y);
}

/* JoyPad 1 */
joypad1[0] = joypad_bits[1] & (1 << RETRO_DEVICE_ID_JOYPAD_UP) ? 1 : 0;
Expand All @@ -1055,8 +1061,18 @@ static void update_input(void)

joypad1[14] = InputState(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X);
joypad1[15] = InputState(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y);
joypad1[16] = InputState(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X);
joypad1[17] = InputState(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y);

// If we have enabled the Dual Controller option, the right analog will be routed to Controller 1
if (!dual_controllers)
{
joypad1[16] = InputState(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X);
joypad1[17] = InputState(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y);
}
else
{
joypad1[16] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X);
joypad1[17] = InputState(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y);
}
}

static void check_variables(bool first_run)
Expand Down Expand Up @@ -1089,6 +1105,18 @@ static void check_variables(bool first_run)
multi_screen_enabled = 1;
}
}

// Check if the Dual Controller option should be set
var.key = "dual_controller_enabled";
var.value = NULL;

dual_controllers = false;

if (Environ(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (strcmp(var.value, "enabled") == 0)
dual_controllers = true;
}
}

void retro_set_environment(retro_environment_t fn)
Expand Down
14 changes: 14 additions & 0 deletions src/libretro_core_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,20 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"right"
},
{
"dual_controller_enabled",
"Enable Dual Controllers",
NULL,
"Maps the Right Analog Keypad Buttons from Controller 2 to Controller 1 Right Analog. This allows games such as Night Stalker and Tron Deadly Discs to support moving and shooting simultaneously.",
NULL,
"input",
{
{ "enabled", "Enabled" },
{ "disabled", "Disabled" },
{ NULL, NULL },
},
"disabled"
},
{
"freeintv_multiscreen_overlay",
"Onscreen Interactive Keypad Overlays (Restart and Touchscreen/Mouse Required)",
Expand Down
Loading