diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:37:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:46:44 +0200 |
| commit | 02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0 (patch) | |
| tree | 72b64a67ebeca41e9b83593da80850e848a99e2e /backends/platform/iphone/osys_main.cpp | |
| parent | 1539023834a2ad7cf8942711d60983891a10a82a (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.gz scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.bz2 scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.zip | |
Merge branch 'master'
Conflicts:
configure
base/plugins.cpp
Diffstat (limited to 'backends/platform/iphone/osys_main.cpp')
| -rw-r--r-- | backends/platform/iphone/osys_main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index 9a33cd8968..f9b2a81ce6 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -145,15 +145,14 @@ bool OSystem_IPHONE::getFeatureState(Feature f) { void OSystem_IPHONE::suspendLoop() { bool done = false; - int eventType; - int x, y; uint32 startTime = getMillis(); stopSoundsystem(); + InternalEvent event; while (!done) { - if (iPhone_fetchEvent(&eventType, &x, &y)) - if ((InputEvent)eventType == kInputApplicationResumed) + if (iPhone_fetchEvent(&event)) + if (event.type == kInputApplicationResumed) done = true; usleep(100000); } @@ -236,6 +235,7 @@ void OSystem_IPHONE::getTimeAndDate(TimeDate &td) const { td.tm_mday = t.tm_mday; td.tm_mon = t.tm_mon; td.tm_year = t.tm_year; + td.tm_wday = t.tm_wday; } Audio::Mixer *OSystem_IPHONE::getMixer() { |