diff options
| author | johndoe123 | 2013-06-17 09:21:16 +0200 |
|---|---|---|
| committer | johndoe123 | 2013-06-17 09:21:16 +0200 |
| commit | f449268380baf0cfa015162903f7e65222146ef0 (patch) | |
| tree | f804345e222780dba137176248e1980b46e90128 /engines | |
| parent | c2475c9c546a072ab8138c6524f025942b22adba (diff) | |
| download | scummvm-rg350-f449268380baf0cfa015162903f7e65222146ef0.tar.gz scummvm-rg350-f449268380baf0cfa015162903f7e65222146ef0.tar.bz2 scummvm-rg350-f449268380baf0cfa015162903f7e65222146ef0.zip | |
NEVERHOOD: Fix Smacker errors in Scene1317 (bug #3613666)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/neverhood/modules/module1300.cpp | 2 | ||||
| -rw-r--r-- | engines/neverhood/scene.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/engines/neverhood/modules/module1300.cpp b/engines/neverhood/modules/module1300.cpp index a60fb25f52..cc5c22085c 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 c65bd3781d..80a2b69169 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; |