diff options
| author | rsn8887 | 2017-02-16 03:19:59 -0600 |
|---|---|---|
| committer | rsn8887 | 2017-02-17 17:55:09 -0600 |
| commit | 613c6f4f7f3a64f857ca59e453b5e53d01e64899 (patch) | |
| tree | b43962e434d4d657e5e0140110b49b5c09ded421 /backends/events/dinguxsdl | |
| parent | c0d155db972323b87af0964f59676be091c76be6 (diff) | |
| download | scummvm-rg350-613c6f4f7f3a64f857ca59e453b5e53d01e64899.tar.gz scummvm-rg350-613c6f4f7f3a64f857ca59e453b5e53d01e64899.tar.bz2 scummvm-rg350-613c6f4f7f3a64f857ca59e453b5e53d01e64899.zip | |
SDL: More fixes to jerky analog joystick pointer
For some engines such as Dreamweb that a previous fix did not apply
to, this fixes bug 6996: Android: Mouse pointer control with
analog joystick is unusable
Diffstat (limited to 'backends/events/dinguxsdl')
| -rw-r--r-- | backends/events/dinguxsdl/dinguxsdl-events.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp index 0492c569e1..f61023206b 100644 --- a/backends/events/dinguxsdl/dinguxsdl-events.cpp +++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp @@ -72,54 +72,54 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { if (ev.key.keysym.sym == PAD_UP) { if (ev.type == SDL_KEYDOWN) { - _km.y_vel = -1; + _km.y_vel = -1 * _km.multiplier; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * _km.multiplier; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); return true; } else if (ev.key.keysym.sym == PAD_DOWN) { if (ev.type == SDL_KEYDOWN) { - _km.y_vel = 1; + _km.y_vel = 1 * _km.multiplier; _km.y_down_count = 1; } else { - _km.y_vel = 0; + _km.y_vel = 0 * _km.multiplier; _km.y_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); return true; } else if (ev.key.keysym.sym == PAD_LEFT) { if (ev.type == SDL_KEYDOWN) { - _km.x_vel = -1; + _km.x_vel = -1 * _km.multiplier; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * _km.multiplier; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); return true; } else if (ev.key.keysym.sym == PAD_RIGHT) { if (ev.type == SDL_KEYDOWN) { - _km.x_vel = 1; + _km.x_vel = 1 * _km.multiplier; _km.x_down_count = 1; } else { - _km.x_vel = 0; + _km.x_vel = 0 * _km.multiplier; _km.x_down_count = 0; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); return true; } else if (ev.key.keysym.sym == BUT_Y) { // left mouse button @@ -129,7 +129,7 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_LBUTTONUP; } - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); return true; } else if (ev.key.keysym.sym == BUT_B) { // right mouse button @@ -139,7 +139,7 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_RBUTTONUP; } - processMouseEvent(event, _km.x, _km.y); + processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); return true; } else if (ev.key.keysym.sym == BUT_X) { // '.' skip dialogue |