diff options
author | Florian Kagerer | 2009-12-26 19:02:16 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-12-26 19:02:16 +0000 |
commit | 2a0b03218c3d6afffac9bebff798850c27f67bd0 (patch) | |
tree | 44cf168fef6b93ee28e7a003c148b263cc2d9170 /engines/kyra/text_lol.cpp | |
parent | 78d268b21a65bcf4e7909f87374a08bec22c7ffe (diff) | |
download | scummvm-rg350-2a0b03218c3d6afffac9bebff798850c27f67bd0.tar.gz scummvm-rg350-2a0b03218c3d6afffac9bebff798850c27f67bd0.tar.bz2 scummvm-rg350-2a0b03218c3d6afffac9bebff798850c27f67bd0.zip |
LOL: - added workaround for portrait speech animations which would sometimes "freeze"
- renamed some stuff
svn-id: r46601
Diffstat (limited to 'engines/kyra/text_lol.cpp')
-rw-r--r-- | engines/kyra/text_lol.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp index 2deb2d6fdf..8f6b04afb9 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text_lol.cpp @@ -211,7 +211,7 @@ void TextDisplayer_LoL::printMessage(uint16 type, const char *str, ...) { if (type & 4) type ^= 4; else - _vm->updatePortraits(); + _vm->stopPortraitSpeechAnim(); uint16 col = textColors[type & 0x7fff]; @@ -706,12 +706,12 @@ void TextDisplayer_LoL::textPageBreak() { _vm->_timer->pauseSingleTimer(11, true); _vm->_fadeText = false; - int updateCharV3 = 0; + int resetPortraitAfterSpeechAnim = 0; int updatePortraitSpeechAnimDuration = 0; if (_vm->_updateCharNum != -1) { - updateCharV3 = _vm->_updateCharV3; - _vm->_updateCharV3 = 0; + resetPortraitAfterSpeechAnim = _vm->_resetPortraitAfterSpeechAnim; + _vm->_resetPortraitAfterSpeechAnim = 0; updatePortraitSpeechAnimDuration = _vm->_updatePortraitSpeechAnimDuration; if (_vm->_updatePortraitSpeechAnimDuration > 36) _vm->_updatePortraitSpeechAnimDuration = 36; @@ -794,7 +794,7 @@ void TextDisplayer_LoL::textPageBreak() { _vm->_timer->pauseSingleTimer(11, false); if (_vm->_updateCharNum != -1) { - _vm->_updateCharV3 = updateCharV3; + _vm->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim; if (updatePortraitSpeechAnimDuration > 36) updatePortraitSpeechAnimDuration -= 36; else |