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/n64/osys_n64_base.cpp | |
| 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/n64/osys_n64_base.cpp')
| -rw-r--r-- | backends/platform/n64/osys_n64_base.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } |