diff options
author | Johannes Schickel | 2012-04-02 00:02:31 +0200 |
---|---|---|
committer | Johannes Schickel | 2012-04-02 00:03:28 +0200 |
commit | b886bc0a418462dd2bb5c0f0d1cf21f8f109b34b (patch) | |
tree | 3f71cffdc5191293549a0c3dade4c6c0ef9f68be /backends/platform/iphone/osys_events.cpp | |
parent | a92c54454f151377e0fc34be525b90c42b42d4af (diff) | |
download | scummvm-rg350-b886bc0a418462dd2bb5c0f0d1cf21f8f109b34b.tar.gz scummvm-rg350-b886bc0a418462dd2bb5c0f0d1cf21f8f109b34b.tar.bz2 scummvm-rg350-b886bc0a418462dd2bb5c0f0d1cf21f8f109b34b.zip |
IPHONE: Use InternalEvent directly.
Diffstat (limited to 'backends/platform/iphone/osys_events.cpp')
-rw-r--r-- | backends/platform/iphone/osys_events.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp index 85efbda208..9cfca0836e 100644 --- a/backends/platform/iphone/osys_events.cpp +++ b/backends/platform/iphone/osys_events.cpp @@ -46,41 +46,40 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) { return true; } - int eventType; - int x, y; + InternalEvent internalEvent; - if (iPhone_fetchEvent(&eventType, &x, &y)) { - switch ((InputEvent)eventType) { + if (iPhone_fetchEvent(&internalEvent)) { + switch (internalEvent.type) { case kInputMouseDown: - if (!handleEvent_mouseDown(event, x, y)) + if (!handleEvent_mouseDown(event, internalEvent.value1, internalEvent.value2)) return false; break; case kInputMouseUp: - if (!handleEvent_mouseUp(event, x, y)) + if (!handleEvent_mouseUp(event, internalEvent.value1, internalEvent.value2)) return false; break; case kInputMouseDragged: - if (!handleEvent_mouseDragged(event, x, y)) + if (!handleEvent_mouseDragged(event, internalEvent.value1, internalEvent.value2)) return false; break; case kInputMouseSecondDragged: - if (!handleEvent_mouseSecondDragged(event, x, y)) + if (!handleEvent_mouseSecondDragged(event, internalEvent.value1, internalEvent.value2)) return false; break; case kInputMouseSecondDown: _secondaryTapped = true; - if (!handleEvent_secondMouseDown(event, x, y)) + if (!handleEvent_secondMouseDown(event, internalEvent.value1, internalEvent.value2)) return false; break; case kInputMouseSecondUp: _secondaryTapped = false; - if (!handleEvent_secondMouseUp(event, x, y)) + if (!handleEvent_secondMouseUp(event, internalEvent.value1, internalEvent.value2)) return false; break; case kInputOrientationChanged: - handleEvent_orientationChanged(x); + handleEvent_orientationChanged(internalEvent.value1); return false; break; @@ -90,11 +89,11 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) { break; case kInputKeyPressed: - handleEvent_keyPressed(event, x); + handleEvent_keyPressed(event, internalEvent.value1); break; case kInputSwipe: - if (!handleEvent_swipe(event, x)) + if (!handleEvent_swipe(event, internalEvent.value1)) return false; break; |