From c18dc9c707235d7ba6fe230cb3045f2c13d04e62 Mon Sep 17 00:00:00 2001
From: Ameer <aj662@drexel.edu>
Date: Wed, 24 Jun 2020 11:39:30 -0400
Subject: padbutton enum class and struct initiailization

---
 src/input_common/gcadapter/gc_poller.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/input_common/gcadapter/gc_poller.cpp')

diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp
index 977261884..06e16880f 100644
--- a/src/input_common/gcadapter/gc_poller.cpp
+++ b/src/input_common/gcadapter/gc_poller.cpp
@@ -96,8 +96,9 @@ Common::ParamPackage GCButtonFactory::GetNextInput() {
             // or to use a while loop shifting the bits to test and set the value.
 
             for (auto button : GCAdapter::PadButtonArray) {
-                if (pad.button & button) {
-                    params.Set("button", button);
+                u16 button_value = static_cast<u16>(button);
+                if (pad.button & button_value) {
+                    params.Set("button", button_value);
                     break;
                 }
             }
@@ -105,7 +106,7 @@ Common::ParamPackage GCButtonFactory::GetNextInput() {
             // For Axis button implementation
             if (pad.axis != GCAdapter::PadAxes::Undefined) {
                 params.Set("axis", static_cast<u8>(pad.axis));
-                params.Set("button", GCAdapter::PAD_STICK);
+                params.Set("button", static_cast<u16>(GCAdapter::PadButton::PAD_STICK));
                 if (pad.axis_value > 128) {
                     params.Set("direction", "+");
                     params.Set("threshold", "0.5");
-- 
cgit v1.2.3