diff options
Diffstat (limited to 'src/common/input.h')
| -rw-r--r-- | src/common/input.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/input.h b/src/common/input.h index 95d30497d..54fcb24b0 100644 --- a/src/common/input.h +++ b/src/common/input.h | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | #include <unordered_map> | 10 | #include <unordered_map> |
| 11 | #include <utility> | 11 | #include <utility> |
| 12 | #include "common/logging/log.h" | 12 | #include "common/logging/log.h" |
| 13 | #include "common/new_uuid.h" | ||
| 14 | #include "common/param_package.h" | 13 | #include "common/param_package.h" |
| 14 | #include "common/uuid.h" | ||
| 15 | 15 | ||
| 16 | namespace Common::Input { | 16 | namespace Common::Input { |
| 17 | 17 | ||
| @@ -97,7 +97,7 @@ struct AnalogStatus { | |||
| 97 | 97 | ||
| 98 | // Button data | 98 | // Button data |
| 99 | struct ButtonStatus { | 99 | struct ButtonStatus { |
| 100 | Common::NewUUID uuid{}; | 100 | Common::UUID uuid{}; |
| 101 | bool value{}; | 101 | bool value{}; |
| 102 | bool inverted{}; | 102 | bool inverted{}; |
| 103 | bool toggle{}; | 103 | bool toggle{}; |
| @@ -109,7 +109,7 @@ using BatteryStatus = BatteryLevel; | |||
| 109 | 109 | ||
| 110 | // Analog and digital joystick data | 110 | // Analog and digital joystick data |
| 111 | struct StickStatus { | 111 | struct StickStatus { |
| 112 | Common::NewUUID uuid{}; | 112 | Common::UUID uuid{}; |
| 113 | AnalogStatus x{}; | 113 | AnalogStatus x{}; |
| 114 | AnalogStatus y{}; | 114 | AnalogStatus y{}; |
| 115 | bool left{}; | 115 | bool left{}; |
| @@ -120,7 +120,7 @@ struct StickStatus { | |||
| 120 | 120 | ||
| 121 | // Analog and digital trigger data | 121 | // Analog and digital trigger data |
| 122 | struct TriggerStatus { | 122 | struct TriggerStatus { |
| 123 | Common::NewUUID uuid{}; | 123 | Common::UUID uuid{}; |
| 124 | AnalogStatus analog{}; | 124 | AnalogStatus analog{}; |
| 125 | ButtonStatus pressed{}; | 125 | ButtonStatus pressed{}; |
| 126 | }; | 126 | }; |