artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #6979 from german77/joycon_name

Browse source 
input_common: Add alternative string for joycons
This commit is contained in:
bunnei 2021-10-02 02:58:25 -07:00 committed by GitHub
parent ae3e51c795 4bc3c788f5
commit 21ed944ff9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/input_common/sdl/sdl_impl.cpp
View file

@ -254,11 +254,25 @@ public:
} }
bool IsJoyconLeft() const { bool IsJoyconLeft() const {
return std::strstr(GetControllerName().c_str(), "Joy-Con Left") != nullptr; const std::string controller_name = GetControllerName();
if (std::strstr(controller_name.c_str(), "Joy-Con Left") != nullptr) {
return true;
}
if (std::strstr(controller_name.c_str(), "Joy-Con (L)") != nullptr) {
return true;
}
return false;
} }
bool IsJoyconRight() const { bool IsJoyconRight() const {
return std::strstr(GetControllerName().c_str(), "Joy-Con Right") != nullptr; const std::string controller_name = GetControllerName();
if (std::strstr(controller_name.c_str(), "Joy-Con Right") != nullptr) {
return true;
}
if (std::strstr(controller_name.c_str(), "Joy-Con (R)") != nullptr) {
return true;
}
return false;
} }
std::string GetControllerName() const { std::string GetControllerName() const {