From 6c0bc43776dcce25182bbbff12e3959193953ab5 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 21 Oct 2022 22:50:08 +0200 Subject: [PATCH] Input: change brightness data type in hid to u32 --- rpcs3/Input/hid_pad_handler.cpp | 4 ++-- rpcs3/Input/hid_pad_handler.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp index 3798495308..6ade38c54e 100644 --- a/rpcs3/Input/hid_pad_handler.cpp +++ b/rpcs3/Input/hid_pad_handler.cpp @@ -240,9 +240,9 @@ std::shared_ptr hid_pad_handler::get_device(const std::string } template -u32 hid_pad_handler::get_battery_color(u8 battery_level, int brightness) +u32 hid_pad_handler::get_battery_color(u8 battery_level, u32 brightness) { - static const std::array battery_level_clr = {0xff00, 0xff33, 0xff66, 0xff99, 0xffcc, 0xffff, 0xccff, 0x99ff, 0x66ff, 0x33ff, 0x00ff, 0x00ff}; + static constexpr std::array battery_level_clr = {0xff00, 0xff33, 0xff66, 0xff99, 0xffcc, 0xffff, 0xccff, 0x99ff, 0x66ff, 0x33ff, 0x00ff, 0x00ff}; const u32 combined_color = battery_level_clr[battery_level < battery_level_clr.size() ? battery_level : 0]; diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/Input/hid_pad_handler.h index 4ce4e79ca7..b89a33e743 100644 --- a/rpcs3/Input/hid_pad_handler.h +++ b/rpcs3/Input/hid_pad_handler.h @@ -110,7 +110,7 @@ protected: return *static_cast(buf); } - static u32 get_battery_color(u8 battery_level, int brightness); + static u32 get_battery_color(u8 battery_level, u32 brightness); private: std::shared_ptr get_device(const std::string& device) override;