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/ps2 | |
| 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/ps2')
| -rw-r--r-- | backends/platform/ps2/systemps2.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/ps2/systemps2.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 5628658381..a7d782b07c 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -571,7 +571,7 @@ void OSystem_PS2::displayMessageOnOSD(const char *msg) { printf("displayMessageOnOSD: %s\n", msg); } -uint32 OSystem_PS2::getMillis(void) { +uint32 OSystem_PS2::getMillis(bool skipRecord) { return msecCount; } diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index 99482d4da4..3ba40a70f9 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -82,7 +82,7 @@ public: virtual void warpMouse(int x, int y); virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = 0); - virtual uint32 getMillis(); + virtual uint32 getMillis(bool skipRecord = false); virtual void delayMillis(uint msecs); virtual bool pollEvent(Common::Event &event); |