Commit 7f65aeaa authored by bbbradsmith's avatar bbbradsmith
Browse files

keyboard-via-joystick button should also be B not A (consistent with others)

parent 25a11fd1
...@@ -515,7 +515,7 @@ void update_input(void) ...@@ -515,7 +515,7 @@ void update_input(void)
virtual_kdb(bmp,vkx,vky); virtual_kdb(bmp,vkx,vky);
i=RETRO_DEVICE_ID_JOYPAD_A; i=RETRO_DEVICE_ID_JOYPAD_B;
if(input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i) && vkflag[4]==0) if(input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i) && vkflag[4]==0)
vkflag[4]=1; vkflag[4]=1;
else if( !input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i) && vkflag[4]==1) else if( !input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i) && vkflag[4]==1)
...@@ -528,7 +528,6 @@ void update_input(void) ...@@ -528,7 +528,6 @@ void update_input(void)
NPAGE=-NPAGE;oldi=-1; NPAGE=-NPAGE;oldi=-1;
//Clear interface zone //Clear interface zone
Screen_SetFullUpdate(); Screen_SetFullUpdate();
} }
else if(i==-1) else if(i==-1)
oldi=-1; oldi=-1;
...@@ -638,8 +637,8 @@ void update_input(void) ...@@ -638,8 +637,8 @@ void update_input(void)
al[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y)); al[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y));
#if defined(VITA) #if defined(VITA)
// fix analog to mouse move up alone // fix analog to mouse move up alone
int analog_deadzone = (15 * 32768 / 100); int analog_deadzone = (15 * 32768 / 100);
double analog_r_magnitude = sqrt((al[0]*al[0]) + (al[1]*al[1])); double analog_r_magnitude = sqrt((al[0]*al[0]) + (al[1]*al[1]));
if (analog_r_magnitude <= analog_deadzone) if (analog_r_magnitude <= analog_deadzone)
{ {
...@@ -701,7 +700,7 @@ void update_input(void) ...@@ -701,7 +700,7 @@ void update_input(void)
void input_gui(void) void input_gui(void)
{ {
int SAVPAS=PAS; int SAVPAS=PAS;
input_poll_cb(); input_poll_cb();
...@@ -728,8 +727,8 @@ void input_gui(void) ...@@ -728,8 +727,8 @@ void input_gui(void)
al[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y)); al[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y));
#if defined(VITA) #if defined(VITA)
// fix analog to mouse move up alone // fix analog to mouse move up alone
int analog_deadzone = (15 * 32768 / 100); int analog_deadzone = (15 * 32768 / 100);
double analog_r_magnitude = sqrt((al[0]*al[0]) + (al[1]*al[1])); double analog_r_magnitude = sqrt((al[0]*al[0]) + (al[1]*al[1]));
if (analog_r_magnitude <= analog_deadzone) if (analog_r_magnitude <= analog_deadzone)
{ {
...@@ -759,7 +758,6 @@ void input_gui(void) ...@@ -759,7 +758,6 @@ void input_gui(void)
mouse_r=input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A); mouse_r=input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A);
PAS=SAVPAS; PAS=SAVPAS;
} }
else else
{ {
...@@ -775,7 +773,7 @@ void input_gui(void) ...@@ -775,7 +773,7 @@ void input_gui(void)
if(mmbL==0 && mouse_l) if(mmbL==0 && mouse_l)
{ {
mmbL=1; mmbL=1;
touch=1; touch=1;
} }
else if(mmbL==1 && !mouse_l) else if(mmbL==1 && !mouse_l)
...@@ -785,7 +783,7 @@ void input_gui(void) ...@@ -785,7 +783,7 @@ void input_gui(void)
} }
if(mmbR==0 && mouse_r) if(mmbR==0 && mouse_r)
mmbR=1; mmbR=1;
else if(mmbR==1 && !mouse_r) else if(mmbR==1 && !mouse_r)
mmbR=0; mmbR=0;
...@@ -799,6 +797,5 @@ void input_gui(void) ...@@ -799,6 +797,5 @@ void input_gui(void)
gmy=0; gmy=0;
if (gmy>retroh-1) if (gmy>retroh-1)
gmy=retroh-1; gmy=retroh-1;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment