BLADERUNNER: Move surfaces out of VQA player

Rename the surfaces to more meaningful names and move ownership out
of the VQA classes. This means that the VQA classes no longer
create their own internal surfaces but instead draw on externally
provided surfaces.

1 files changed, 4 insertions, 4 deletions

diff --git a/engines/bladerunner/vqa_player.h b/engines/bladerunner/vqa_player.h
index 8c2653ec85..b60f648d4d 100644
--- a/engines/bladerunner/vqa_player.h
+++ b/engines/bladerunner/vqa_player.h
@@ -48,8 +48,8 @@ class ZBuffer;
 class VQAPlayer {
 	BladeRunnerEngine           *_vm;
 	Common::SeekableReadStream  *_s;
-	VQADecoder                   _decoder;
 	const Graphics::Surface     *_surface;
+	VQADecoder                   _decoder;
 	const uint16                *_zBuffer;
 	Audio::QueuingAudioStream   *_audioStream;
 
@@ -75,10 +75,11 @@ class VQAPlayer {
 
 public:
 
-	VQAPlayer(BladeRunnerEngine *vm)
+	VQAPlayer(BladeRunnerEngine *vm, Graphics::Surface *surface)
 		: _vm(vm),
 		  _s(nullptr),
-		  _surface(nullptr),
+		  _surface(surface),
+		  _decoder(surface),
 		  _zBuffer(nullptr),
 		  _audioStream(nullptr),
 		  _frameNext(-1),
@@ -104,7 +105,6 @@ public:
 	void close();
 
 	int  update();
-	const Graphics::Surface *getSurface() const;
 	void updateZBuffer(ZBuffer *zbuffer);
 	void updateView(View *view);
 	void updateLights(Lights *lights);