diff options
author | wwylele <wwylele@gmail.com> | 2016-03-26 08:46:48 +0100 |
---|---|---|
committer | wwylele <wwylele@gmail.com> | 2016-03-26 08:46:48 +0100 |
commit | 6bd5f982728fdfa3793cacb82394d8a5e876a7da (patch) | |
tree | e782575b1301c9e392261e81edae61acd7642968 /src/common | |
parent | Merge pull request #1549 from wwylele/acc_gyro (diff) | |
download | yuzu-6bd5f982728fdfa3793cacb82394d8a5e876a7da.tar yuzu-6bd5f982728fdfa3793cacb82394d8a5e876a7da.tar.gz yuzu-6bd5f982728fdfa3793cacb82394d8a5e876a7da.tar.bz2 yuzu-6bd5f982728fdfa3793cacb82394d8a5e876a7da.tar.lz yuzu-6bd5f982728fdfa3793cacb82394d8a5e876a7da.tar.xz yuzu-6bd5f982728fdfa3793cacb82394d8a5e876a7da.tar.zst yuzu-6bd5f982728fdfa3793cacb82394d8a5e876a7da.zip |
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/emu_window.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index b6b7bfd26..7c3486dea 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -105,7 +105,7 @@ public: * @todo Fix this function to be thread-safe. * @return PadState object indicating the current pad state */ - const Service::HID::PadState GetPadState() const { + Service::HID::PadState GetPadState() const { return pad_state; } @@ -116,7 +116,7 @@ public: * @return std::tuple of (x, y, pressed) where `x` and `y` are the touch coordinates and * `pressed` is true if the touch screen is currently being pressed */ - const std::tuple<u16, u16, bool> GetTouchState() const { + std::tuple<u16, u16, bool> GetTouchState() const { return std::make_tuple(touch_x, touch_y, touch_pressed); } |