[Scummvm-cvs-logs] scummvm master -> ab4420b3ca591f707ea831cb077e88b800986471
lordhoto
lordhoto at gmail.com
Sun Feb 19 05:22:18 CET 2012
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ffaa8612c3 IPHONE: Change F5 (menu) gesture to open up the GMM.
ab4420b3ca IPHONE: Take advantage of Common::EVENT_INVALID.
Commit: ffaa8612c3024f2ec97692015553dd846e31d830
https://github.com/scummvm/scummvm/commit/ffaa8612c3024f2ec97692015553dd846e31d830
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-18T20:21:10-08:00
Commit Message:
IPHONE: Change F5 (menu) gesture to open up the GMM.
Thanks to tsoliman for this patch.
Changed paths:
NEWS
backends/platform/iphone/osys_events.cpp
diff --git a/NEWS b/NEWS
index e1e06b2..53c6ca7 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ For a more comprehensive changelog of the latest experimental code, see:
- Added support for the Macintosh version of SPY Fox in Hold the Mustard.
- Added a difficulty selection dialog for Loom FM-TOWNS.
+ iPhone port:
+ - Changed "F5 (menu)" gesture to open up the global main menu instead.
+
Windows port:
- Changed default savegames location for Windows NT4/2000/XP/Vista/7.
(The migration batch file can be used to copy savegames from the old
diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp
index 1ab1db0..f6dae2f 100644
--- a/backends/platform/iphone/osys_events.cpp
+++ b/backends/platform/iphone/osys_events.cpp
@@ -319,12 +319,9 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
if (absX < kMaxDeviation && vecY >= kNeededLength) {
// Swipe down
- event.type = Common::EVENT_KEYDOWN;
- _queuedInputEvent.type = Common::EVENT_KEYUP;
+ event.type = Common::EVENT_MAINMENU;
+ _queuedInputEvent.type = Common::EVENT_INVALID;
- event.kbd.flags = _queuedInputEvent.kbd.flags = 0;
- event.kbd.keycode = _queuedInputEvent.kbd.keycode = Common::KEYCODE_F5;
- event.kbd.ascii = _queuedInputEvent.kbd.ascii = Common::ASCII_F5;
_queuedEventTime = getMillis() + kQueuedInputEventDelay;
return true;
}
Commit: ab4420b3ca591f707ea831cb077e88b800986471
https://github.com/scummvm/scummvm/commit/ab4420b3ca591f707ea831cb077e88b800986471
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-18T20:21:17-08:00
Commit Message:
IPHONE: Take advantage of Common::EVENT_INVALID.
Changed paths:
backends/platform/iphone/osys_events.cpp
backends/platform/iphone/osys_main.cpp
diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp
index f6dae2f..a3075e2 100644
--- a/backends/platform/iphone/osys_events.cpp
+++ b/backends/platform/iphone/osys_events.cpp
@@ -40,9 +40,9 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) {
_timerCallbackNext = curTime + _timerCallbackTimer;
}
- if (_queuedInputEvent.type != (Common::EventType)0 && curTime >= _queuedEventTime) {
+ if (_queuedInputEvent.type != Common::EVENT_INVALID && curTime >= _queuedEventTime) {
event = _queuedInputEvent;
- _queuedInputEvent.type = (Common::EventType)0;
+ _queuedInputEvent.type = Common::EVENT_INVALID;
return true;
}
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index 4bc567c..b0f475b 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -62,7 +62,7 @@ OSystem_IPHONE::OSystem_IPHONE() :
_mouseDirty(false), _timeSuspended(0), _lastDragPosX(-1), _lastDragPosY(-1), _screenChangeCount(0),
_overlayHeight(0), _overlayWidth(0), _overlayBuffer(0)
{
- _queuedInputEvent.type = (Common::EventType)0;
+ _queuedInputEvent.type = Common::EVENT_INVALID;
_lastDrawnMouseRect = Common::Rect(0, 0, 0, 0);
_touchpadModeEnabled = !iPhone_isHighResDevice();
More information about the Scummvm-git-logs
mailing list