From 5130b8a6a919d711e558f8ab7bd03655a38d3f09 Mon Sep 17 00:00:00 2001
From: Morph1984 <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 4 Sep 2019 02:42:58 -0400
Subject: Update npad.cpp

---
 src/core/hle/service/hid/controllers/npad.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/core/hle/service/hid/controllers')

diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 1e81f776f..eb44b6026 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -636,10 +636,15 @@ Controller_NPad::LedPattern Controller_NPad::GetLedPattern(u32 npad_id) {
         return LedPattern{0, 0, 0, 0};
     };
 }
+
 void Controller_NPad::SetVibrationEnabled(bool can_vibrate) {
     can_controllers_vibrate = can_vibrate;
 }
 
+bool Controller_NPad::IsVibrationEnabled() {
+    return can_controllers_vibrate;
+}
+
 void Controller_NPad::ClearAllConnectedControllers() {
     for (auto& controller : connected_controllers) {
         if (controller.is_connected && controller.type != NPadControllerType::None) {
@@ -648,6 +653,7 @@ void Controller_NPad::ClearAllConnectedControllers() {
         }
     }
 }
+
 void Controller_NPad::DisconnectAllConnectedControllers() {
     std::for_each(connected_controllers.begin(), connected_controllers.end(),
                   [](ControllerHolder& controller) { controller.is_connected = false; });
-- 
cgit v1.2.3


From ee35f7adf7864df4a9b511c71b08e8fc980e484f Mon Sep 17 00:00:00 2001
From: Morph1984 <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 4 Sep 2019 02:43:17 -0400
Subject: Update npad.h

---
 src/core/hle/service/hid/controllers/npad.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/hle/service/hid/controllers')

diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index 4b6c1083f..5572a9a14 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -119,6 +119,7 @@ public:
     void DisconnectNPad(u32 npad_id);
     LedPattern GetLedPattern(u32 npad_id);
     void SetVibrationEnabled(bool can_vibrate);
+    bool IsVibrationEnabled();
     void ClearAllConnectedControllers();
     void DisconnectAllConnectedControllers();
     void ConnectAllDisconnectedControllers();
-- 
cgit v1.2.3


From ef98828d40378f9c020f59dec25b4e21fe0dbc39 Mon Sep 17 00:00:00 2001
From: Morph1984 <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 4 Sep 2019 10:15:49 -0400
Subject: IsVibrationEnabled() as a const member func

---
 src/core/hle/service/hid/controllers/npad.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/hle/service/hid/controllers')

diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index eb44b6026..e47fe8188 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -641,7 +641,7 @@ void Controller_NPad::SetVibrationEnabled(bool can_vibrate) {
     can_controllers_vibrate = can_vibrate;
 }
 
-bool Controller_NPad::IsVibrationEnabled() {
+bool Controller_NPad::IsVibrationEnabled() const {
     return can_controllers_vibrate;
 }
 
-- 
cgit v1.2.3


From cd81194fc00af3cdc30d7221785c18e536982b4c Mon Sep 17 00:00:00 2001
From: Morph1984 <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 4 Sep 2019 10:16:22 -0400
Subject: ditto

Co-Authored-By: David <25727384+ogniK5377@users.noreply.github.com>
---
 src/core/hle/service/hid/controllers/npad.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/hle/service/hid/controllers')

diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index 5572a9a14..f28b36806 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -119,7 +119,7 @@ public:
     void DisconnectNPad(u32 npad_id);
     LedPattern GetLedPattern(u32 npad_id);
     void SetVibrationEnabled(bool can_vibrate);
-    bool IsVibrationEnabled();
+    bool IsVibrationEnabled() const;
     void ClearAllConnectedControllers();
     void DisconnectAllConnectedControllers();
     void ConnectAllDisconnectedControllers();
-- 
cgit v1.2.3