diff options
| author | athrxx | 2011-06-05 01:03:55 +0200 |
|---|---|---|
| committer | athrxx | 2011-06-05 01:37:59 +0200 |
| commit | 66c982b38ce9463daad621f8129dd97e0bb1a6ce (patch) | |
| tree | 61b5361f5531486aedf0e7a7331dc63262926dd4 /engines/kyra/lol.cpp | |
| parent | b15a5c8e133eb198843714d1593b829793142374 (diff) | |
| download | scummvm-rg350-66c982b38ce9463daad621f8129dd97e0bb1a6ce.tar.gz scummvm-rg350-66c982b38ce9463daad621f8129dd97e0bb1a6ce.tar.bz2 scummvm-rg350-66c982b38ce9463daad621f8129dd97e0bb1a6ce.zip | |
LOL: cleanup
- fix RTL during outro/credits
- get rid of _animator
- fix wrong memset
Diffstat (limited to 'engines/kyra/lol.cpp')
| -rw-r--r-- | engines/kyra/lol.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 9b0ae173d5..3a8a332840 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -42,7 +42,6 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy _gui = 0; _txt = 0; _tim = 0; - _animator = 0; switch (_flags.lang) { case Common::EN_ANY: @@ -576,7 +575,6 @@ Common::Error LoLEngine::go() { _tim = new TIMInterpreter_LoL(this, _screen, _system); assert(_tim); - _animator = _tim->animator(); if (shouldQuit()) return Common::kNoError; @@ -1811,11 +1809,13 @@ void LoLEngine::createTransparencyTables() { } void LoLEngine::updateSequenceBackgroundAnimations() { - if (_updateFlags & 8 || !_animator) + if (_updateFlags & 8 || !_tim) + return; + if (!_tim->animator()) return; for (int i = 0; i < 6; i++) - _animator->update(i); + _tim->animator()->update(i); } void LoLEngine::loadTalkFile(int index) { @@ -2720,7 +2720,7 @@ int LoLEngine::processMagicMistOfDoom(int charNum, int spellLevel) { _screen->copyPage(12, 0); updateDrawPage2(); - this->snd_playQueuedEffects(); + snd_playQueuedEffects(); return 1; } |