summaryrefslogtreecommitdiff
path: root/src/input_common/input_mapping.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2022-01-24 11:48:59 -0500
committerGravatar Lioncash2022-01-24 11:49:52 -0500
commit187c9d7e33220dd100abf5d5b76f9d9cab7f3084 (patch)
treea0fa545d1e0a6e9111e7c39f29b7a16cfdcc56eb /src/input_common/input_mapping.cpp
parentinput_common/input_mapping: Add missing includes (diff)
downloadyuzu-187c9d7e33220dd100abf5d5b76f9d9cab7f3084.tar.gz
yuzu-187c9d7e33220dd100abf5d5b76f9d9cab7f3084.tar.xz
yuzu-187c9d7e33220dd100abf5d5b76f9d9cab7f3084.zip
input_common/input_mapping: Simplify UUID validity checks
Makes the checks a little more intuitive to read and doesn't construct an extra UUID instance
Diffstat (limited to 'src/input_common/input_mapping.cpp')
-rw-r--r--src/input_common/input_mapping.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp
index 02c7ccff7..a7a6ad8c2 100644
--- a/src/input_common/input_mapping.cpp
+++ b/src/input_common/input_mapping.cpp
@@ -56,7 +56,7 @@ void MappingFactory::StopMapping() {
56void MappingFactory::RegisterButton(const MappingData& data) { 56void MappingFactory::RegisterButton(const MappingData& data) {
57 Common::ParamPackage new_input; 57 Common::ParamPackage new_input;
58 new_input.Set("engine", data.engine); 58 new_input.Set("engine", data.engine);
59 if (data.pad.guid != Common::UUID{}) { 59 if (data.pad.guid.IsValid()) {
60 new_input.Set("guid", data.pad.guid.Format()); 60 new_input.Set("guid", data.pad.guid.Format());
61 } 61 }
62 new_input.Set("port", static_cast<int>(data.pad.port)); 62 new_input.Set("port", static_cast<int>(data.pad.port));
@@ -92,7 +92,7 @@ void MappingFactory::RegisterButton(const MappingData& data) {
92void MappingFactory::RegisterStick(const MappingData& data) { 92void MappingFactory::RegisterStick(const MappingData& data) {
93 Common::ParamPackage new_input; 93 Common::ParamPackage new_input;
94 new_input.Set("engine", data.engine); 94 new_input.Set("engine", data.engine);
95 if (data.pad.guid != Common::UUID{}) { 95 if (data.pad.guid.IsValid()) {
96 new_input.Set("guid", data.pad.guid.Format()); 96 new_input.Set("guid", data.pad.guid.Format());
97 } 97 }
98 new_input.Set("port", static_cast<int>(data.pad.port)); 98 new_input.Set("port", static_cast<int>(data.pad.port));
@@ -137,7 +137,7 @@ void MappingFactory::RegisterStick(const MappingData& data) {
137void MappingFactory::RegisterMotion(const MappingData& data) { 137void MappingFactory::RegisterMotion(const MappingData& data) {
138 Common::ParamPackage new_input; 138 Common::ParamPackage new_input;
139 new_input.Set("engine", data.engine); 139 new_input.Set("engine", data.engine);
140 if (data.pad.guid != Common::UUID{}) { 140 if (data.pad.guid.IsValid()) {
141 new_input.Set("guid", data.pad.guid.Format()); 141 new_input.Set("guid", data.pad.guid.Format());
142 } 142 }
143 new_input.Set("port", static_cast<int>(data.pad.port)); 143 new_input.Set("port", static_cast<int>(data.pad.port));