summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWeiyi Wang <wwylele@gmail.com>2017-02-11 10:11:42 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-02-11 10:11:42 +0100
commit0dd007e9ba935940964c53d7467ae9d4135717de (patch)
tree12d4983a9f0f1b9a8ff642324711b4ea29fbcb2d /src
parentvideo_core: Fix benign out-of-bounds indexing of array (#2553) (diff)
downloadyuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar.gz
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar.bz2
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar.lz
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar.xz
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar.zst
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/frontend/emu_window.cpp2
-rw-r--r--src/core/hle/service/hid/hid.h4
2 files changed, 0 insertions, 6 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index 4f0f786ce..6b4637741 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -70,14 +70,12 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
(framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top);
touch_pressed = true;
- pad_state.touch.Assign(1);
}
void EmuWindow::TouchReleased() {
touch_pressed = false;
touch_x = 0;
touch_y = 0;
- pad_state.touch.Assign(0);
}
void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 21e66dfe0..c7f4ee138 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -42,8 +42,6 @@ struct PadState {
BitField<14, 1, u32> zl;
BitField<15, 1, u32> zr;
- BitField<20, 1, u32> touch;
-
BitField<24, 1, u32> c_right;
BitField<25, 1, u32> c_left;
BitField<26, 1, u32> c_up;
@@ -203,8 +201,6 @@ const PadState PAD_Y = {{1u << 11}};
const PadState PAD_ZL = {{1u << 14}};
const PadState PAD_ZR = {{1u << 15}};
-const PadState PAD_TOUCH = {{1u << 20}};
-
const PadState PAD_C_RIGHT = {{1u << 24}};
const PadState PAD_C_LEFT = {{1u << 25}};
const PadState PAD_C_UP = {{1u << 26}};