From 12c9fb03820c383d5d10fa3c3ba8e2cffad8db98 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 12 Jun 2007 06:08:47 +0000
Subject: Add support for pausing/resume cutscenes shown on the OmniTV in The
 Feeble Files.

svn-id: r27371
---
 engines/sword2/animation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sword2/animation.cpp')

diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index 2eb24430c7..c3b20d9f57 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -518,7 +518,7 @@ bool MoviePlayerDXA::load() {
 
 	if (loadFile(filename)) {
 		// The Broken Sword games always use external audio tracks.
-		if (_fd.readUint32BE() != MKID_BE('NULL'))
+		if (_fd->readUint32BE() != MKID_BE('NULL'))
 			return false;
 
 		_frameBuffer = _vm->_screen->getScreen();
-- 
cgit v1.2.3


From db8e5332fc4109898f44b01dd7d4faa362debbe2 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 21 Jun 2007 19:33:05 +0000
Subject: Use the KEYCODE constants.

svn-id: r27593
---
 engines/sword2/animation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sword2/animation.cpp')

diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index c3b20d9f57..12998e5e6d 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -429,7 +429,7 @@ void MoviePlayer::play(SequenceTextInfo *textList, uint32 numLines, int32 leadIn
 				terminate = true;
 				break;
 			case Common::EVENT_KEYDOWN:
-				if (event.kbd.keycode == 27)
+				if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
 					terminate = true;
 				break;
 			default:
-- 
cgit v1.2.3