diff options
| author | Autechre | 2020-10-31 23:59:27 +0100 |
|---|---|---|
| committer | GitHub | 2020-10-31 23:59:27 +0100 |
| commit | a5e7ffa71b24529cc1d63f0bb85454c78dc112c8 (patch) | |
| tree | 254f6f9c49f31b123c3a5ab01979df225a125c27 | |
| parent | 2ead2fb6d618305ca48e50e1982bb7e01bf45237 (diff) | |
| parent | 4c7a462ed37b73f05ff8cc16b477c22e5b2daa26 (diff) | |
| download | pcsx_rearmed-a5e7ffa71b24529cc1d63f0bb85454c78dc112c8.tar.gz pcsx_rearmed-a5e7ffa71b24529cc1d63f0bb85454c78dc112c8.tar.bz2 pcsx_rearmed-a5e7ffa71b24529cc1d63f0bb85454c78dc112c8.zip | |
Merge pull request #470 from negativeExponent/pads
remove dfinput, fix negcon input
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | frontend/libretro.c | 4 | ||||
| -rw-r--r-- | libpcsxcore/plugins.c | 11 |
3 files changed, 12 insertions, 5 deletions
@@ -258,7 +258,9 @@ LDFLAGS += -lm endif # dfinput +ifneq "$(PLATFORM)" "libretro" OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o +endif # frontend/gui OBJS += frontend/cspace.o diff --git a/frontend/libretro.c b/frontend/libretro.c index 323932a..6416b67 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -1440,7 +1440,7 @@ bool retro_load_game(const struct retro_game_info *info) } plugin_call_rearmed_cbs(); - dfinput_activate(); + /* dfinput_activate(); */ if (CheckCdrom() == -1) { @@ -2198,7 +2198,7 @@ static void update_variables(bool in_flight) GPU_open(&gpuDisp, "PCSX", NULL); } - dfinput_activate(); + /* dfinput_activate(); */ } else { diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index 19de72c..8d99be2 100644 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -747,7 +747,8 @@ unsigned char _PADpoll(int port, unsigned char value) { req = value; // Don't enable Analog/Vibration for a standard pad - if (in_type[port] == PSE_PAD_TYPE_STANDARD) { + if (in_type[port] == PSE_PAD_TYPE_STANDARD || + in_type[port] == PSE_PAD_TYPE_NEGCON) { ; // Pad keystate already in buffer } else @@ -772,9 +773,13 @@ unsigned char _PADpoll(int port, unsigned char value) { case CMD_READ_DATA_AND_VIBRATE: //mem the vibration value for Large motor; pad[port].Vib[1] = value; + + if (in_type[port] == PSE_PAD_TYPE_STANDARD && + in_type[port] == PSE_PAD_TYPE_NEGCON) + break; + //vibration - if (in_type[port] != PSE_PAD_TYPE_STANDARD) - vibrate(port); + vibrate(port); break; } break; |