revert OmniBlade's fix it breaks analog controllers

This commit is contained in:
AndresSM 2014-08-16 15:03:38 -05:00
parent 1053f8f54d
commit 25618a51fd

View File

@ -3042,22 +3042,22 @@ void retro_set_controller_port_device(unsigned in_port, unsigned device)
case RETRO_DEVICE_PS1PAD:
if (log_cb)
log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type standard gamepad.\n", MEDNAFEN_CORE_NAME);
SetInput(in_port, "gamepad", &input_buf[in_port]);
SetInput(in_port, "gamepad", &buf.u8[in_port]);
break;
case RETRO_DEVICE_DUALANALOG:
if (log_cb)
log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type Dual Analog.\n", MEDNAFEN_CORE_NAME);
SetInput(in_port, "dualanalog", &input_buf[in_port]);
SetInput(in_port, "dualanalog", &buf.u8[in_port]);
break;
case RETRO_DEVICE_DUALSHOCK:
if (log_cb)
log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type DualShock.\n", MEDNAFEN_CORE_NAME);
SetInput(in_port, "dualshock", &input_buf[in_port]);
SetInput(in_port, "dualshock", &buf.u8[in_port]);
break;
case RETRO_DEVICE_FLIGHTSTICK:
if (log_cb)
log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type FlightStick.\n", MEDNAFEN_CORE_NAME);
SetInput(in_port, "analogjoy", &input_buf[in_port]);
SetInput(in_port, "analogjoy", &buf.u8[in_port]);
break;
default:
if (log_cb)
@ -3101,12 +3101,12 @@ void retro_set_environment(retro_environment_t cb)
static const struct retro_controller_info ports[] = {
{ pads, 4 },
{ pads, 4 },
{ pads, 3 },
{ pads, 3 },
{ pads, 3 },
{ pads, 3 },
{ pads, 3 },
{ pads, 3 },
{ pads, 4 },
{ pads, 4 },
{ pads, 4 },
{ pads, 4 },
{ pads, 4 },
{ pads, 4 },
{ 0 },
};