ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(dinput.c) Cleanups

This commit is contained in:
twinaphex 2019-07-08 02:40:09 +02:00
parent a33913c984
commit a200d9683c
1 changed files with 76 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
input/drivers/dinput.c
View File

@ -270,10 +270,10 @@ static bool dinput_mouse_button_pressed(
return false;
/* the driver only supports one mouse */
if ( settings->uints.input_mouse_index[ port ] != 0 )
if ( settings->uints.input_mouse_index[ port ] != 0)
return false;
switch ( key )
switch (key)
{
case RETRO_DEVICE_ID_MOUSE_LEFT:
return di->mouse_l;
@ -378,7 +378,7 @@ static int16_t dinput_pressed_analog(struct dinput_input *di,
return pressed_plus + pressed_minus;
}
static int16_t dinput_lightgun_aiming_state( struct dinput_input *di, unsigned idx, unsigned id )
static int16_t dinput_lightgun_aiming_state( struct dinput_input *di, unsigned idx, unsigned id)
{
const int edge_detect = 32700;
struct video_viewport vp;
@ -400,33 +400,31 @@ static int16_t dinput_lightgun_aiming_state( struct dinput_input *di, unsigned i
vp.full_width = 0;
vp.full_height = 0;
while ( check_pos && num < idx )
while ( check_pos && num < idx)
{
num++;
check_pos = check_pos->next;
}
if ( !check_pos && idx > 0 ) /* idx = 0 has mouse fallback. */
if (!check_pos && idx > 0) /* idx = 0 has mouse fallback. */
return 0;
x = di->mouse_x;
y = di->mouse_y;
if ( check_pos )
if (check_pos)
{
x = check_pos->pointer_x;
y = check_pos->pointer_y;
}
if ( !( video_driver_translate_coord_viewport_wrap(
&vp, x, y, &res_x, &res_y, &res_screen_x, &res_screen_y ) ) )
{
&vp, x, y, &res_x, &res_y, &res_screen_x, &res_screen_y)))
return 0;
}
inside = (res_x >= -edge_detect) && (res_y >= -edge_detect) && (res_x <= edge_detect) && (res_y <= edge_detect);
switch ( id )
switch (id)
{
case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X:
return inside ? res_x : 0;
@ -451,9 +449,8 @@ static int16_t dinput_mouse_state(struct dinput_input *di, unsigned port, unsign
return false;
/* the driver only supports one mouse */
if ( settings->uints.input_mouse_index[ port ] != 0 ) {
if (settings->uints.input_mouse_index[ port ] != 0)
return 0;
}
switch (id)
{
@ -504,9 +501,8 @@ static int16_t dinput_mouse_state_screen(struct dinput_input *di, unsigned port,
return false;
/* the driver only supports one mouse */
if ( settings->uints.input_mouse_index[ port ] != 0 ) {
if (settings->uints.input_mouse_index[ port ] != 0)
return 0;
}
switch (id)
{
@ -646,13 +642,13 @@ static int16_t dinput_input_state(void *data,
device == RARCH_DEVICE_POINTER_SCREEN);
case RETRO_DEVICE_LIGHTGUN:
switch ( id )
switch (id)
{
/*aiming*/
case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X:
case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y:
case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN:
return dinput_lightgun_aiming_state( di, idx, id );
return dinput_lightgun_aiming_state( di, idx, id);
/*buttons*/
case RETRO_DEVICE_ID_LIGHTGUN_TRIGGER: