diff options
| author | Willem Jan Palenstijn | 2009-10-03 20:49:18 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-10-03 20:49:18 +0000 |
| commit | b9cdb1abb76c94723c24ca66eb8d47d96c8c5ebd (patch) | |
| tree | d4f40b3f6a8f55aef1e24506bd3771f8269d64a1 /engines/sci/engine/kmisc.cpp | |
| parent | f6de0b4ec9fcc240cdc0c46aedb2e2089e07bd5c (diff) | |
| download | scummvm-rg350-b9cdb1abb76c94723c24ca66eb8d47d96c8c5ebd.tar.gz scummvm-rg350-b9cdb1abb76c94723c24ca66eb8d47d96c8c5ebd.tar.bz2 scummvm-rg350-b9cdb1abb76c94723c24ca66eb8d47d96c8c5ebd.zip | |
SCI: Merge new GUI code written by m_kiewitz.
This is a major rewrite of the graphics code. A slightly adapted
version of the old code is still available and currently the default.
The new code is selectable in sci.cpp, but is not yet finished.
svn-id: r44565
Diffstat (limited to 'engines/sci/engine/kmisc.cpp')
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index 4d0bd8a73a..e46f707aae 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -131,7 +131,8 @@ reg_t kGetTime(EngineState *s, int argc, reg_t *argv) { switch (mode) { case K_NEW_GETTIME_TICKS : - retval = start_time * 60 / 1000; + retval = s->gui->getTimeTicks(); // FIXME + //retval = start_time * 60 / 1000; debugC(2, kDebugLevelTime, "GetTime(elapsed) returns %d", retval); break; case K_NEW_GETTIME_TIME_12HOUR : |