diff options
author | Johannes Schickel | 2008-05-05 21:57:26 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-05-05 21:57:26 +0000 |
commit | 0faf76bfacb5769b008ae24c956775975b152629 (patch) | |
tree | 1af813b0e85e7d86fca05d773da808bdfc8382ad | |
parent | 874be3cfb49027df093d984f0ff1b98ddd13708f (diff) | |
download | scummvm-rg350-0faf76bfacb5769b008ae24c956775975b152629.tar.gz scummvm-rg350-0faf76bfacb5769b008ae24c956775975b152629.tar.bz2 scummvm-rg350-0faf76bfacb5769b008ae24c956775975b152629.zip |
Removed delay from KyraEngine_MR::npcChatSequence, since it's doing delay script internally. This fixes some chat animation speeds.
svn-id: r31884
-rw-r--r-- | engines/kyra/script_mr.cpp | 3 | ||||
-rw-r--r-- | engines/kyra/text_mr.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp index df7e5cc522..8746ec83d7 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -728,7 +728,7 @@ int KyraEngine_MR::o3_daggerWarning(EMCState *script) { int selection = 1; _screen->hideMouse(); - _screen->copyRegionToBuffer(0, 0, 0, 320, 200, _screenBuffer); + _screen->copyRegionToBuffer(1, 0, 0, 320, 200, _screenBuffer); int curPageBackUp = _screen->_curPage; _screen->_curPage = 2; @@ -1121,6 +1121,7 @@ int KyraEngine_MR::o3d_delay(EMCState *script) { updateWithText(); else update(); + _system->delayMillis(10); } return 0; diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index 309637303a..35f91c1ccc 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -738,8 +738,6 @@ void KyraEngine_MR::npcChatSequence(const char *str, int object, int vocHigh, in resetSkipFlag(); running = false; } - - delay(10); } _text->restoreScreen(); _chatText = 0; |