[Scummvm-cvs-logs] SF.net SVN: scummvm:[46352] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 46352
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46352&view=rev
Author:   athrxx
Date:     2009-12-12 20:50:41 +0000 (Sat, 12 Dec 2009)

Log Message:
-----------
LOL: fix compilation when the LOL engine is disabled

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/animator_tim.cpp
    scummvm/trunk/engines/kyra/script_tim.h

Modified: scummvm/trunk/engines/kyra/animator_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_tim.cpp	2009-12-12 20:06:42 UTC (rev 46351)
+++ scummvm/trunk/engines/kyra/animator_tim.cpp	2009-12-12 20:50:41 UTC (rev 46352)
@@ -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 @@
 		_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 @@
 	SWAP(res, anim->lastPart);
 	return res;
 }
+#endif
 
 } // End of namespace Kyra

Modified: scummvm/trunk/engines/kyra/script_tim.h
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.h	2009-12-12 20:06:42 UTC (rev 46351)
+++ scummvm/trunk/engines/kyra/script_tim.h	2009-12-12 20:50:41 UTC (rev 46352)
@@ -66,7 +66,11 @@
 		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 @@
 
 	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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.