diff options
author | johndoe123 | 2012-10-09 18:30:39 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:44:40 +0200 |
commit | fd13b546a7d2a2f63cca8ace7aa900a590f665bb (patch) | |
tree | 7807ad4e476fae139de05e91a3670867927557a3 /engines/neverhood/smackerscene.cpp | |
parent | 59901c5d13f59c64e4ed3174544f39b7b507b0ca (diff) | |
download | scummvm-rg350-fd13b546a7d2a2f63cca8ace7aa900a590f665bb.tar.gz scummvm-rg350-fd13b546a7d2a2f63cca8ace7aa900a590f665bb.tar.bz2 scummvm-rg350-fd13b546a7d2a2f63cca8ace7aa900a590f665bb.zip |
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
Diffstat (limited to 'engines/neverhood/smackerscene.cpp')
-rw-r--r-- | engines/neverhood/smackerscene.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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); } |