diff options
author | johndoe123 | 2013-04-18 19:08:22 +0200 |
---|---|---|
committer | johndoe123 | 2013-04-18 19:08:22 +0200 |
commit | 176a3babc553d1d6eb2a57fddb0a9665fc4aaa71 (patch) | |
tree | 239f044793de424c8ca50e739beab44b122609c6 /engines/wintermute/base/scriptables/script.cpp | |
parent | e935f85366ba1e83fdd1cea3712959edee1f6270 (diff) | |
parent | 6c55213cd5a63ff198a25573ad38672e7faa02ce (diff) | |
download | scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.gz scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.bz2 scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.zip |
Merge branch 'master' of github.com:scummvm/scummvm into sword25-gfx
Diffstat (limited to 'engines/wintermute/base/scriptables/script.cpp')
-rw-r--r-- | engines/wintermute/base/scriptables/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index 23c452b73c..56ffbf75c5 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -1194,7 +1194,7 @@ bool ScScript::sleep(uint32 duration) { _waitTime = g_system->getMillis() + duration; _waitFrozen = true; } else { - _waitTime = _gameRef->_timer + duration; + _waitTime = _gameRef->getTimer()->getTime() + duration; _waitFrozen = false; } return STATUS_OK; |