Skip to content

Only pass JoystickType to getInputName() #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinmoran wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Only pass JoystickType to getInputName() #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/combined.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,9 +869,9 @@ void updateJoysticks(Joysticks* joysticks)
}
}

const char* getInputName(Joysticks joysticks, unsigned int joystickIndex, unsigned int inputIndex)
const char* getInputName(JoystickType type, unsigned int inputIndex)
{
switch (joysticks.states[joystickIndex].type)
switch (type)
{
case JoystickTypeGeneric: return genericInputNames[inputIndex];
case JoystickTypeDualshock4: return ps4InputNames[inputIndex];
Expand All @@ -894,7 +894,7 @@ int main()
{
if (state->currentInputs[inputIndex] > 0.5 && state->previousInputs[inputIndex] <= 0.5f)
{
const char* inputName = getInputName(joysticks, joystickIndex, inputIndex);
const char* inputName = getInputName(state->type, inputIndex);
if (joystickIndex >= 0 && joystickIndex <= 3) {
printf("XBox controller %d: ", joystickIndex);
}
Expand Down