From c0b095d793cf2ffa71830cc7d1ebb153ac70eccb Mon Sep 17 00:00:00 2001 From: rsn8887 Date: Sat, 18 Feb 2017 12:25:47 -0600 Subject: SDL: Cleanup, replaced _km.multiplier with #define --- backends/events/gph/gph-events.cpp | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'backends/events/gph') diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp index 06acfa489e..d59d0bead5 100644 --- a/backends/events/gph/gph-events.cpp +++ b/backends/events/gph/gph-events.cpp @@ -230,116 +230,116 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { switch (ev.jbutton.button) { case BUTTON_UP: if (_km.y_down_count != 2) { - _km.y_vel = -1 * _km.multiplier; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = -4 * _km.multiplier; + _km.y_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_DOWN: if (_km.y_down_count != 2) { - _km.y_vel = 1 * _km.multiplier; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 4 * _km.multiplier; + _km.y_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_LEFT: if (_km.x_down_count != 2) { - _km.x_vel = -1 * _km.multiplier; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = -4 * _km.multiplier; + _km.x_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_RIGHT: if (_km.x_down_count != 3) { - _km.x_vel = 1 * _km.multiplier; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 4 * _km.multiplier; + _km.x_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_UPLEFT: if (_km.x_down_count != 2) { - _km.x_vel = -1 * _km.multiplier; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = -4 * _km.multiplier; + _km.x_vel = -4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = -1 * _km.multiplier; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = -4 * _km.multiplier; + _km.y_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_UPRIGHT: if (_km.x_down_count != 2) { - _km.x_vel = 1 * _km.multiplier; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 4 * _km.multiplier; + _km.x_vel = 4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = -1 * _km.multiplier; + _km.y_vel = -1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = -4 * _km.multiplier; + _km.y_vel = -4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_DOWNLEFT: if (_km.x_down_count != 2) { - _km.x_vel = -1 * _km.multiplier; + _km.x_vel = -1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = -4 * _km.multiplier; + _km.x_vel = -4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = 1 * _km.multiplier; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 4 * _km.multiplier; + _km.y_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_DOWNRIGHT: if (_km.x_down_count != 2) { - _km.x_vel = 1 * _km.multiplier; + _km.x_vel = 1 * MULTIPLIER; _km.x_down_count = 1; } else { - _km.x_vel = 4 * _km.multiplier; + _km.x_vel = 4 * MULTIPLIER; } if (_km.y_down_count != 2) { - _km.y_vel = 1 * _km.multiplier; + _km.y_vel = 1 * MULTIPLIER; _km.y_down_count = 1; } else { - _km.y_vel = 4 * _km.multiplier; + _km.y_vel = 4 * MULTIPLIER; } event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_B: case BUTTON_CLICK: event.type = Common::EVENT_LBUTTONDOWN; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_X: event.type = Common::EVENT_RBUTTONDOWN; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_L: BUTTON_STATE_L = true; @@ -454,16 +454,16 @@ bool GPHEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { _km.x_vel = 0; _km.x_down_count = 0; event.type = Common::EVENT_MOUSEMOVE; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_B: case BUTTON_CLICK: event.type = Common::EVENT_LBUTTONUP; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_X: event.type = Common::EVENT_RBUTTONUP; - processMouseEvent(event, _km.x / _km.multiplier, _km.y / _km.multiplier); + processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER); break; case BUTTON_L: BUTTON_STATE_L = false; -- cgit v1.2.3