Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
Fmsx
Commits
20c80540
Unverified
Commit
20c80540
authored
Nov 16, 2021
by
Libretro-Admin
Committed by
GitHub
Nov 16, 2021
Browse files
Merge pull request #67 from cayce-msx/enable-second-joystick
enable second joystick, and fix 2 small spelling issues
parents
277b5992
dcb9bf06
Pipeline
#67032
passed with stages
in 8 minutes and 12 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
libretro.c
View file @
20c80540
...
...
@@ -357,7 +357,7 @@ static void set_input_descriptors(void)
{
1
,
RETRO_DEVICE_JOYPAD
,
0
,
RETRO_DEVICE_ID_JOYPAD_DOWN
,
"Stick Down"
},
{
1
,
RETRO_DEVICE_JOYPAD
,
0
,
RETRO_DEVICE_ID_JOYPAD_RIGHT
,
"Stick Right"
},
{
1
,
RETRO_DEVICE_JOYPAD
,
0
,
RETRO_DEVICE_ID_JOYPAD_A
,
"Fire A"
},
{
1
,
RETRO_DEVICE_JOYPAD
,
0
,
RETRO_DEVICE_ID_JOYPAD_B
,
"FireB"
},
{
1
,
RETRO_DEVICE_JOYPAD
,
0
,
RETRO_DEVICE_ID_JOYPAD_B
,
"Fire
B"
},
{
0
},
};
struct
retro_input_descriptor
descriptors
[
32
];
...
...
@@ -399,7 +399,7 @@ void retro_set_environment(retro_environment_t cb)
{
"Joystick"
,
RETRO_DEVICE_JOYPAD
},
};
static
const
struct
retro_controller_description
port1
[]
=
{
{
"
j
oystick"
,
RETRO_DEVICE_JOYPAD
}
{
"
J
oystick"
,
RETRO_DEVICE_JOYPAD
}
};
static
const
struct
retro_controller_info
ports
[]
=
{
{
port0
,
4
},
...
...
@@ -714,7 +714,8 @@ bool retro_load_game(const struct retro_game_info *info)
CasName
=
NULL
;
}
SETJOYTYPE
(
0
,
1
);
SETJOYTYPE
(
0
,
JOY_STICK
);
SETJOYTYPE
(
1
,
JOY_STICK
);
set_image_buffer_size
(
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment