diff options
author | Florian Kagerer | 2009-03-24 07:18:16 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-03-24 07:18:16 +0000 |
commit | e9b4124f1d82f0bfcafdbbb40797c7d767e16c91 (patch) | |
tree | a3fd0c3b667f853e41462ccab153876a9ebeaf86 /engines/kyra/script_tim.cpp | |
parent | 74a82ef4273aec05cb3fcefa4b77ab8a57cdc863 (diff) | |
download | scummvm-rg350-e9b4124f1d82f0bfcafdbbb40797c7d767e16c91.tar.gz scummvm-rg350-e9b4124f1d82f0bfcafdbbb40797c7d767e16c91.tar.bz2 scummvm-rg350-e9b4124f1d82f0bfcafdbbb40797c7d767e16c91.zip |
LOL: - implemented lots of opcodes and fixed a few bugs
- it's now possible to leave the castle
svn-id: r39653
Diffstat (limited to 'engines/kyra/script_tim.cpp')
-rw-r--r-- | engines/kyra/script_tim.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 8333d4c612..2a6811f8b1 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -936,10 +936,12 @@ void TIMInterpreter_LoL::startBackgroundAnimation(int animIndex, int part) { anim->curFrame = p->firstFrame; anim->cyclesCompleted = 0; - anim->wsa->setX(anim->x); - anim->wsa->setY(anim->y); - anim->wsa->setDrawPage(0); - anim->wsa->displayFrame(anim->curFrame - 1, 0, 0); + if (anim->wsa) { + anim->wsa->setX(anim->x); + anim->wsa->setY(anim->y); + anim->wsa->setDrawPage(0); + anim->wsa->displayFrame(anim->curFrame - 1, 0, 0); + } } void TIMInterpreter_LoL::stopBackgroundAnimation(int animIndex) { @@ -1128,7 +1130,7 @@ uint16 TIMInterpreter_LoL::processDialogue() { _vm->updatePortraits(); - if (!_vm->textEnabled() && _vm->_hideControls) { + if (!_vm->textEnabled() && _vm->_currentControlMode) { _screen->setScreenDim(5); const ScreenDim *d = _screen->getScreenDim(5); _screen->fillRect(d->sx, d->sy + d->h - 9, d->sx + d->w - 1, d->sy + d->h - 1, d->unkA); |