Merge pull request #6979 from german77/joycon_name

input_common: Add alternative string for joycons
This commit is contained in:
bunnei 2021-10-02 02:58:25 -07:00 committed by GitHub
commit 21ed944ff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions

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 {