diff options
| author | Paul Gilbert | 2013-07-04 08:44:49 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-07-04 08:44:49 -0400 |
| commit | fa737fd5af3763a152e92c4b74c114876b3a8573 (patch) | |
| tree | 3e698f9c095ba692c6e305b35785a8f45f5e061b /backends/platform/null | |
| parent | a49a7d5ad4f4435ed8cee0934c94155586f2dd99 (diff) | |
| parent | baafae672f3489b0eaf77c22be0c65ba31e6b73d (diff) | |
| download | scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.gz scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.bz2 scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.zip | |
Merge branch 'master' into tsage_r2r
Diffstat (limited to 'backends/platform/null')
| -rw-r--r-- | backends/platform/null/null.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp index 4690a67c55..9e05539799 100644 --- a/backends/platform/null/null.cpp +++ b/backends/platform/null/null.cpp @@ -49,7 +49,7 @@ public: virtual bool pollEvent(Common::Event &event); - virtual uint32 getMillis(); + virtual uint32 getMillis(bool skipRecord = false); virtual void delayMillis(uint msecs); virtual void getTimeAndDate(TimeDate &t) const {} |