Skip to content

Commit 7deec64

Browse files
committed
block joystick if mouse emulated
1 parent eb0c594 commit 7deec64

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

libretro/core/core-mapper.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ int second_joystick_enable = 0;
9595

9696
void read_joystick(int nr, unsigned int *dir, int *button)
9797
{
98+
if (MOUSE_EMULATED==1 && SHOWKEY==-1)
9899
int up = input_state_cb(nr, RETRO_DEVICE_JOYPAD, 0,RETRO_DEVICE_ID_JOYPAD_UP);
99100
int down = input_state_cb(nr, RETRO_DEVICE_JOYPAD, 0,RETRO_DEVICE_ID_JOYPAD_DOWN);
100101
int left = input_state_cb(nr, RETRO_DEVICE_JOYPAD, 0,RETRO_DEVICE_ID_JOYPAD_LEFT);
@@ -105,7 +106,7 @@ void read_joystick(int nr, unsigned int *dir, int *button)
105106
*dir = 0;
106107
*button = 0;
107108

108-
if ((nr == 0) && (SHOWKEY==1) || (pauseg==1))
109+
if ((nr == 0) && (SHOWKEY==1) || (pauseg==1) || (MOUSE_EMULATED==1))
109110
return;
110111

111112
if ((nr == 1) && (!second_joystick_enable))

0 commit comments

Comments
 (0)