diff options
| -rw-r--r-- | engines/kyra/animator_tim.cpp | 10 | ||||
| -rw-r--r-- | engines/kyra/script_tim.h | 10 |
2 files changed, 19 insertions, 1 deletions
diff --git a/engines/kyra/animator_tim.cpp b/engines/kyra/animator_tim.cpp index 5e2245608f..bab24727ce 100644 --- a/engines/kyra/animator_tim.cpp +++ b/engines/kyra/animator_tim.cpp @@ -32,11 +32,17 @@ #ifdef ENABLE_LOL #include "kyra/lol.h" -#endif ENABLE_LOL +#else +#include "kyra/screen_v2.h" +#endif namespace Kyra { +#ifdef ENABLE_LOL TimAnimator::TimAnimator(LoLEngine *engine, Screen_v2 *screen_v2, OSystem *system, bool useParts) : _vm(engine), _screen(screen_v2), _system(system), _useParts(useParts) { +#else +TimAnimator::TimAnimator(KyraEngine_v1 *engine, Screen_v2 *screen_v2, OSystem *system, bool useParts) : _vm(engine), _screen(screen_v2), _system(system), _useParts(useParts) { +#endif _animations = new Animation[TIM::kWSASlots]; memset(_animations, 0, TIM::kWSASlots * sizeof(Animation)); @@ -102,6 +108,7 @@ void TimAnimator::displayFrame(int animIndex, int page, int frame) { _screen->updateScreen(); } +#ifdef ENABLE_LOL void TimAnimator::setupPart(int animIndex, int part, int firstFrame, int lastFrame, int cycles, int nextPart, int partDelay, int f, int sfxIndex, int sfxFrame) { AnimPart *a = &_animations[animIndex].parts[part]; a->firstFrame = firstFrame; @@ -224,5 +231,6 @@ int TimAnimator::resetLastPart(int animIndex) { SWAP(res, anim->lastPart); return res; } +#endif } // End of namespace Kyra diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h index ec9601721e..729f3a9b58 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script_tim.h @@ -66,7 +66,11 @@ public: AnimPart *parts; }; +#ifdef ENABLE_LOL TimAnimator(LoLEngine *engine, Screen_v2 *screen_v2, OSystem *system, bool useParts); +#else + TimAnimator(KyraEngine_v1 *engine, Screen_v2 *screen_v2, OSystem *system, bool useParts); +#endif ~TimAnimator(); Animation *getAnimPtr(int index) { return (index >= 0 && index < 6) ? &_animations[index] : 0; } @@ -76,15 +80,21 @@ public: void displayFrame(int animIndex, int page, int frame); +#ifdef ENABLE_LOL void setupPart(int animIndex, int part, int firstFrame, int lastFrame, int cycles, int nextPart, int partDelay, int f, int sfxIndex, int sfxFrame); void start(int animIndex, int part); void stop(int animIndex); void update(int animIndex); void playPart(int animIndex, int firstFrame, int lastFrame, int delay); int resetLastPart(int animIndex); +#endif private: +#ifdef ENABLE_LOL LoLEngine *_vm; +#else + KyraEngine_v1 *_vm; +#endif Screen_v2 *_screen; OSystem *_system; |