From fd13b546a7d2a2f63cca8ace7aa900a590f665bb Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Tue, 9 Oct 2012 18:30:39 +0000
Subject: NEVERHOOD: Rename stuff in the Scene class and clean up a little

- Try to stay close to the actual frame rate
- Also use the Smacker frame rate when a video is playing to
  keep videos in sync with the audio
---
 engines/neverhood/smackerscene.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/neverhood/smackerscene.cpp')

diff --git a/engines/neverhood/smackerscene.cpp b/engines/neverhood/smackerscene.cpp
index 9982043dea..375f7f3aa8 100644
--- a/engines/neverhood/smackerscene.cpp
+++ b/engines/neverhood/smackerscene.cpp
@@ -73,6 +73,7 @@ void SmackerScene::nextVideo() {
 		uint32 smackerFileHash = _fileHashList[_fileHashListIndex];
 		if (_vm->_res->getResourceTypeByHash(smackerFileHash) != 10) {
 			// Not a Smacker file
+			_vm->_screen->setSmackerDecoder(NULL);
 			sendMessage(_parentModule, 0x1009, 0);
 			return;
 		}
@@ -80,12 +81,13 @@ void SmackerScene::nextVideo() {
 		if (!_fieldDF) {
 			setSubVar(0x00800410, smackerFileHash, 1);
 		}
-		if (_fileHashListIndex == 0) {
+		if (_fileHashListIndex == 0)
 			_smackerPlayer = addSmackerPlayer(new SmackerPlayer(_vm, this, smackerFileHash, _doubleSurface, false));
-		} else {
+		else
 			_smackerPlayer->open(smackerFileHash, false);
-		}
+		_vm->_screen->setSmackerDecoder(_smackerPlayer->getSmackerDecoder());
 	} else {
+		_vm->_screen->setSmackerDecoder(NULL);
 		sendMessage(_parentModule, 0x1009, 0);
 	}
 
-- 
cgit v1.2.3