diff options
| author | Eugene Sandulenko | 2013-07-04 04:58:54 -0700 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-07-04 04:58:54 -0700 |
| commit | 49210a803a53b84bcabe42fd339a1b205236c34d (patch) | |
| tree | d5916067b55404324fb70a3d3ee0a8f672f92679 /backends/platform/iphone | |
| parent | 2b980e86e3db2ebc2279761ba29c0be4f24e03dc (diff) | |
| parent | b286a6d033287dce11dfa4216ad11728b892667d (diff) | |
| download | scummvm-rg350-49210a803a53b84bcabe42fd339a1b205236c34d.tar.gz scummvm-rg350-49210a803a53b84bcabe42fd339a1b205236c34d.tar.bz2 scummvm-rg350-49210a803a53b84bcabe42fd339a1b205236c34d.zip | |
Merge pull request #331 from sev-/gsoc2012-eventsrecorder
GSoC2012: Event Recorder (reworked)
Diffstat (limited to 'backends/platform/iphone')
| -rw-r--r-- | backends/platform/iphone/osys_main.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/iphone/osys_main.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index ed2c886213..460d3fd2ac 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -166,7 +166,7 @@ void OSystem_IPHONE::suspendLoop() { _timeSuspended += getMillis() - startTime; } -uint32 OSystem_IPHONE::getMillis() { +uint32 OSystem_IPHONE::getMillis(bool skipRecord) { //printf("getMillis()\n"); struct timeval currentTime; diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index 037125490d..811a8ddb2e 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -165,7 +165,7 @@ public: virtual void setCursorPalette(const byte *colors, uint start, uint num); virtual bool pollEvent(Common::Event &event); - virtual uint32 getMillis(); + virtual uint32 getMillis(bool skipRecord = false); virtual void delayMillis(uint msecs); virtual MutexRef createMutex(void); |