diff options
| author | bunnei <bunneidev@gmail.com> | 2016-02-13 21:10:05 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-02-13 21:10:05 -0500 |
| commit | 0d086616d1af239b8e41b246bea3c1ef85fc907f (patch) | |
| tree | 0dc7778532b0e2d1c5acd0224266b8a67d961155 /src/common/emu_window.cpp | |
| parent | f1d1049c4fdf51fd382f9afb6b5cd5f104e71b0e (diff) | |
| parent | 6c71858c5c698a718045ba44eda495080417a84b (diff) | |
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 b69b05cb9a..b2807354a5 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) { (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); touch_pressed = true; - pad_state.touch = 1; + pad_state.touch.Assign(1); } void EmuWindow::TouchReleased() { touch_pressed = false; touch_x = 0; touch_y = 0; - pad_state.touch = 0; + pad_state.touch.Assign(0); } void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { |