diff options
| -rw-r--r-- | engines/neverhood/diskplayerscene.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp index da1ec984a5..534b2b9fe0 100644 --- a/engines/neverhood/diskplayerscene.cpp +++ b/engines/neverhood/diskplayerscene.cpp @@ -478,12 +478,12 @@ void DiskplayerScene::openSmacker(uint32 fileHash, bool keepLastFrame) { removeSurface(_diskSmackerPlayer->getSurface()); _diskSmackerPlayer->open(fileHash, keepLastFrame); addSurface(_diskSmackerPlayer->getSurface()); + _vm->_screen->setSmackerDecoder(_diskSmackerPlayer->getSmackerDecoder()); + _palette->usePalette(); } void DiskplayerScene::stop() { openSmacker(0x08288103, true); - _vm->_screen->setSmackerDecoder(_diskSmackerPlayer->getSmackerDecoder()); - _palette->usePalette(); _ssPlayButton->release(); _updateStatus = kUSStopped; _diskSlots[_diskIndex]->activate(); @@ -491,8 +491,6 @@ void DiskplayerScene::stop() { void DiskplayerScene::tuneIn() { openSmacker(0x900001C1, false); - _vm->_screen->setSmackerDecoder(_diskSmackerPlayer->getSmackerDecoder()); - _palette->usePalette(); _ssPlayButton->release(); _updateStatus = kUSTuningIn; _diskSlots[_diskIndex]->activate(); @@ -500,16 +498,12 @@ void DiskplayerScene::tuneIn() { void DiskplayerScene::playDisk() { openSmacker(kDiskplayerSmackerFileHashes[_diskIndex], false); - _vm->_screen->setSmackerDecoder(_diskSmackerPlayer->getSmackerDecoder()); - _palette->usePalette(); _updateStatus = kUSPlaying; _diskSlots[_diskIndex]->play(); } void DiskplayerScene::playStatic() { openSmacker(0x90000101, false); - _vm->_screen->setSmackerDecoder(_diskSmackerPlayer->getSmackerDecoder()); - _palette->usePalette(); _ssPlayButton->release(); _updateStatus = kUSPlaying; _diskSlots[_diskIndex]->activate(); |