diff options
| author | Florian Kagerer | 2009-12-13 15:19:56 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-12-13 15:19:56 +0000 |
| commit | adba314fc679be40f6341764ca9f45d0a027b865 (patch) | |
| tree | 91aee558553cffb8977e665968c0aa1daf87cbc5 /engines/kyra/animator_tim.cpp | |
| parent | 35c695929a65529f710735d2f5d79f1e24952ddf (diff) | |
| download | scummvm-rg350-adba314fc679be40f6341764ca9f45d0a027b865.tar.gz scummvm-rg350-adba314fc679be40f6341764ca9f45d0a027b865.tar.bz2 scummvm-rg350-adba314fc679be40f6341764ca9f45d0a027b865.zip | |
LOL: some cleanup for recent code changes
svn-id: r46358
Diffstat (limited to 'engines/kyra/animator_tim.cpp')
| -rw-r--r-- | engines/kyra/animator_tim.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/animator_tim.cpp b/engines/kyra/animator_tim.cpp index bab24727ce..d9ca83d665 100644 --- a/engines/kyra/animator_tim.cpp +++ b/engines/kyra/animator_tim.cpp @@ -97,13 +97,13 @@ void TimAnimator::reset(int animIndex, bool clearStruct) { } } -void TimAnimator::displayFrame(int animIndex, int page, int frame) { +void TimAnimator::displayFrame(int animIndex, int page, int frame, int flags) { TimAnimator::Animation *anim = &_animations[animIndex]; if ((anim->wsaCopyParams & 0x4000) != 0) page = 2; // WORKAROUND for some bugged scripts that will try to display frames of non-existent animations if (anim->wsa) - anim->wsa->displayFrame(frame, page, anim->x, anim->y, anim->wsaCopyParams & 0xF0FF, 0, 0); + anim->wsa->displayFrame(frame, page, anim->x, anim->y, (flags == -1) ? (anim->wsaCopyParams & 0xF0FF) : flags, 0, 0); if (!page) _screen->updateScreen(); } |