From 0d65cb426074581986526c44b74e0d5ed02b6216 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 18 Dec 2006 07:24:36 +0000
Subject: Check _scaleMode when decoding a NULL frame. Otherwise we will draw
 the unscaled frame when playing a scaled movie. (The Broken Sword 1 intro is
 a good example of this since it is scaled and uses NULL frames early on.)

svn-id: r24870
---
 graphics/dxa_player.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'graphics/dxa_player.cpp')

diff --git a/graphics/dxa_player.cpp b/graphics/dxa_player.cpp
index 580f95e686..e55c54fe3c 100644
--- a/graphics/dxa_player.cpp
+++ b/graphics/dxa_player.cpp
@@ -535,8 +535,12 @@ void DXAPlayer::decodeNextFrame() {
 		}
 	}
 
-	if (tag == MKID_BE('NULL'))
-		_drawBuffer = _frameBuffer1;
+	if (tag == MKID_BE('NULL')) {
+		if (_scaleMode == S_NONE)
+			_drawBuffer = _frameBuffer1;
+		else
+			_drawBuffer = _scaledBuffer;
+	}
 }
 
 } // End of namespace Graphics
-- 
cgit v1.2.3