diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-12-29 01:29:44 +0100 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-12-29 01:29:49 +0100 |
| commit | 0c5ede492f8dd2e321bb237a56e7f38609541366 (patch) | |
| tree | bc00e6bb78b9b60050f26dd632c4171e54ea8407 /src | |
| parent | web_browser: Add bounds checking to applet interface (diff) | |
| download | yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.gz yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.bz2 yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.lz yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.xz yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.zst yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nfp/nfp.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 615d4e6d8..eca27c056 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -3,6 +3,8 @@ // Refer to the license.txt file included. #pragma once + +#include "controllers/controller_base.h" #include "core/hle/service/service.h" namespace CoreTiming { @@ -19,8 +21,6 @@ class ServiceManager; namespace Service::HID { -class ControllerBase; - enum class HidController : std::size_t { DebugPad, Touchscreen, diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index a7bed0040..9ca5461db 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -11,7 +11,6 @@ #include "core/hle/kernel/readable_event.h" #include "core/hle/kernel/writable_event.h" #include "core/hle/lock.h" -#include "core/hle/service/hid/hid.h" #include "core/hle/service/nfp/nfp.h" #include "core/hle/service/nfp/nfp_user.h" diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 18dc93c95..4eb73792f 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -351,7 +351,7 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view running_exit_check = true; } - const auto input = npad.GetPressState(); + const auto input = npad.GetAndResetPressState(); for (std::size_t i = 0; i < Settings::NativeButton::NumButtons; ++i) { if ((input & (1 << i)) != 0) { LOG_DEBUG(Frontend, "firing input for button id={:02X}", i); |