libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 10:48:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LOL: fix compilation when the LOL engine is disabled

Browse Source 
svn-id: r46352
This commit is contained in:
Florian Kagerer 2009-12-12 20:50:41 +00:00
parent f4c54fb636
commit 90b4d4b45c
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/kyra/animator_tim.cpp
View File

@ -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

10
engines/kyra/script_tim.h
View File

@ -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;