diff options
| author | 2016-02-13 21:10:05 -0500 | |
|---|---|---|
| committer | 2016-02-13 21:10:05 -0500 | |
| commit | 0d086616d1af239b8e41b246bea3c1ef85fc907f (patch) | |
| tree | 0dc7778532b0e2d1c5acd0224266b8a67d961155 /src/common/emu_window.cpp | |
| parent | Merge pull request #1264 from bunnei/fragment-lighting-hw (diff) | |
| parent | BitField: Make trivially copyable and remove assignment operator (diff) | |
| download | yuzu-0d086616d1af239b8e41b246bea3c1ef85fc907f.tar.gz yuzu-0d086616d1af239b8e41b246bea3c1ef85fc907f.tar.xz yuzu-0d086616d1af239b8e41b246bea3c1ef85fc907f.zip | |
Merge pull request #1406 from MerryMage/bitfield2
BitField: Make trivially copyable and remove assignment operator.
Diffstat (limited to 'src/common/emu_window.cpp')
| -rw-r--r-- | src/common/emu_window.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp index b69b05cb9..b2807354a 100644 --- a/src/common/emu_window.cpp +++ b/src/common/emu_window.cpp | |||
| @@ -55,14 +55,14 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) { | |||
| 55 | (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); | 55 | (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); |
| 56 | 56 | ||
| 57 | touch_pressed = true; | 57 | touch_pressed = true; |
| 58 | pad_state.touch = 1; | 58 | pad_state.touch.Assign(1); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | void EmuWindow::TouchReleased() { | 61 | void EmuWindow::TouchReleased() { |
| 62 | touch_pressed = false; | 62 | touch_pressed = false; |
| 63 | touch_x = 0; | 63 | touch_x = 0; |
| 64 | touch_y = 0; | 64 | touch_y = 0; |
| 65 | pad_state.touch = 0; | 65 | pad_state.touch.Assign(0); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { | 68 | void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { |