1 files changed, 9 insertions, 9 deletions

diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h
index fdceca1cd8..1bb06371c3 100644
--- a/engines/kyra/wsamovie.h
+++ b/engines/kyra/wsamovie.h
@@ -37,7 +37,7 @@ class Screen_v2;
 
 class Movie {
 public:
-	Movie(KyraEngine_v1 *vm) : _vm(vm), _opened(false),  _x(-1), _y(-1), _drawPage(-1) {}
+	Movie(KyraEngine_v1 *vm) : _vm(vm), _screen(vm->screen()), _opened(false),  _x(-1), _y(-1), _drawPage(-1) {}
 	virtual ~Movie() {}
 
 	virtual bool opened() { return _opened; }
@@ -53,10 +53,11 @@ public:
 
 	virtual int frames() = 0;
 
-	virtual void displayFrame(int frameNum, int pageNum, int x, int y, ...) = 0;
+	virtual void displayFrame(int frameNum, int pageNum, int x, int y, uint16 flags, const uint8 *table1, const uint8 *table2) = 0;
 
 protected:
 	KyraEngine_v1 *_vm;
+	Screen *_screen;
 	bool _opened;
 
 	int _x, _y;
@@ -76,7 +77,7 @@ public:
 
 	virtual int frames() { return _opened ? _numFrames : -1; }
 
-	virtual void displayFrame(int frameNum, int pageNum, int x, int y, ...);
+	virtual void displayFrame(int frameNum, int pageNum, int x, int y, uint16 flags, const uint8 *table1, const uint8 *table2);
 
 	enum WSAFlags {
 		WF_OFFSCREEN_DECODE = 0x10,
@@ -107,7 +108,7 @@ public:
 	int open(const char *filename, int offscreen, uint8 *palette);
 	void close();
 
-	void displayFrame(int frameNum, int pageNum, int x, int y, ...);
+	void displayFrame(int frameNum, int pageNum, int x, int y, uint16 flags, const uint8 *table1, const uint8 *table2);
 private:
 	void processFrame(int frameNum, uint8 *dst);
 
@@ -116,11 +117,12 @@ private:
 
 class WSAMovie_v2 : public WSAMovie_v1 {
 public:
-	WSAMovie_v2(KyraEngine_v1 *vm, Screen_v2 *screen);
+	WSAMovie_v2(KyraEngine_v1 *vm);
 
 	int open(const char *filename, int unk1, uint8 *palette);
-
-	virtual void displayFrame(int frameNum, int pageNum, int x, int y, ...);
+	virtual void displayFrame(int frameNum, int pageNum, int x, int y, uint16 flags, const uint8 *table1, const uint8 *table2) {
+		WSAMovie_v1::displayFrame(frameNum, pageNum, x + _xAdd, y + _yAdd, flags, table1, table2);
+	}
 
 	int xAdd() const { return _xAdd; }
 	int yAdd() const { return _yAdd; }
@@ -128,8 +130,6 @@ public:
 	void setWidth(int w) { _width = w; }
 	void setHeight(int h) { _height = h; }
 protected:
-	Screen_v2 *_screen;
-
 	int16 _xAdd;
 	int16 _yAdd;
 };