diff options
| -rw-r--r-- | src/core/frontend/emu_window.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 4 |
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) { | |||
| 70 | (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); | 70 | (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); |
| 71 | 71 | ||
| 72 | touch_pressed = true; | 72 | touch_pressed = true; |
| 73 | pad_state.touch.Assign(1); | ||
| 74 | } | 73 | } |
| 75 | 74 | ||
| 76 | void EmuWindow::TouchReleased() { | 75 | void EmuWindow::TouchReleased() { |
| 77 | touch_pressed = false; | 76 | touch_pressed = false; |
| 78 | touch_x = 0; | 77 | touch_x = 0; |
| 79 | touch_y = 0; | 78 | touch_y = 0; |
| 80 | pad_state.touch.Assign(0); | ||
| 81 | } | 79 | } |
| 82 | 80 | ||
| 83 | void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { | 81 | 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 { | |||
| 42 | BitField<14, 1, u32> zl; | 42 | BitField<14, 1, u32> zl; |
| 43 | BitField<15, 1, u32> zr; | 43 | BitField<15, 1, u32> zr; |
| 44 | 44 | ||
| 45 | BitField<20, 1, u32> touch; | ||
| 46 | |||
| 47 | BitField<24, 1, u32> c_right; | 45 | BitField<24, 1, u32> c_right; |
| 48 | BitField<25, 1, u32> c_left; | 46 | BitField<25, 1, u32> c_left; |
| 49 | BitField<26, 1, u32> c_up; | 47 | BitField<26, 1, u32> c_up; |
| @@ -203,8 +201,6 @@ const PadState PAD_Y = {{1u << 11}}; | |||
| 203 | const PadState PAD_ZL = {{1u << 14}}; | 201 | const PadState PAD_ZL = {{1u << 14}}; |
| 204 | const PadState PAD_ZR = {{1u << 15}}; | 202 | const PadState PAD_ZR = {{1u << 15}}; |
| 205 | 203 | ||
| 206 | const PadState PAD_TOUCH = {{1u << 20}}; | ||
| 207 | |||
| 208 | const PadState PAD_C_RIGHT = {{1u << 24}}; | 204 | const PadState PAD_C_RIGHT = {{1u << 24}}; |
| 209 | const PadState PAD_C_LEFT = {{1u << 25}}; | 205 | const PadState PAD_C_LEFT = {{1u << 25}}; |
| 210 | const PadState PAD_C_UP = {{1u << 26}}; | 206 | const PadState PAD_C_UP = {{1u << 26}}; |