[Scummvm-cvs-logs] scummvm master -> f449268380baf0cfa015162903f7e65222146ef0

[johndoe123]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f449268380 NEVERHOOD: Fix Smacker errors in Scene1317 (bug #3613666)


Commit: f449268380baf0cfa015162903f7e65222146ef0
    https://github.com/scummvm/scummvm/commit/f449268380baf0cfa015162903f7e65222146ef0
Author: johndoe123 (john_doe at techie.com)
Date: 2013-06-17T00:21:16-07:00

Commit Message:
NEVERHOOD: Fix Smacker errors in Scene1317 (bug #3613666)

Changed paths:
    engines/neverhood/modules/module1300.cpp
    engines/neverhood/scene.cpp



diff --git a/engines/neverhood/modules/module1300.cpp b/engines/neverhood/modules/module1300.cpp
index a60fb25..cc5c220 100644
--- a/engines/neverhood/modules/module1300.cpp
+++ b/engines/neverhood/modules/module1300.cpp
@@ -1711,6 +1711,7 @@ Scene1317::Scene1317(NeverhoodEngine *vm, Module *parentModule)
 void Scene1317::update() {
 	if (_smackerFileHash) {
 		_smackerPlayer->open(_smackerFileHash, _keepLastSmackerFrame);
+		_vm->_screen->setSmackerDecoder(_smackerPlayer->getSmackerDecoder());
 		_smackerFileHash = 0;
 	}
 	Scene::update();
@@ -1733,6 +1734,7 @@ void Scene1317::upChooseKing() {
 			
 	if (_smackerFileHash) {
 		_smackerPlayer->open(_smackerFileHash, _keepLastSmackerFrame);
+		_vm->_screen->setSmackerDecoder(_smackerPlayer->getSmackerDecoder());
 		_smackerFileHash = 0;
 	}
 
diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp
index c65bd37..80a2b69 100644
--- a/engines/neverhood/scene.cpp
+++ b/engines/neverhood/scene.cpp
@@ -59,6 +59,8 @@ Scene::Scene(NeverhoodEngine *vm, Module *parentModule)
 
 Scene::~Scene() {
 
+	_vm->_screen->setSmackerDecoder(NULL);
+
 	if (_palette) {
 		removeEntity(_palette);
 		delete _palette;