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/n64 | |
| 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/n64')
| -rw-r--r-- | backends/platform/n64/osys_n64.h | 2 | ||||
| -rw-r--r-- | backends/platform/n64/osys_n64_base.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h index bc6b3cb1a5..10138b230a 100644 --- a/backends/platform/n64/osys_n64.h +++ b/backends/platform/n64/osys_n64.h @@ -184,7 +184,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); diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index 1e2aca9e51..afd93f5e09 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -810,7 +810,7 @@ void OSystem_N64::setMouseCursor(const void *buf, uint w, uint h, int hotspotX, return; } -uint32 OSystem_N64::getMillis() { +uint32 OSystem_N64::getMillis(bool skipRecord) { return getMilliTick(); } |