diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 13:11:31 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 13:11:31 +0200 |
| commit | 3fe7f2cbe2b70eaa824b7159d94d40c2280006a3 (patch) | |
| tree | ea592da00ad567c75008137f79eeba16c3ba40c4 /engines/sword2/function.cpp | |
| parent | 246109839b9c196e9181a6f619c15694456b9aec (diff) | |
| parent | 10a947a0be80ea8c5c88bd3493a5057b1223ce45 (diff) | |
| download | scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.tar.gz scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.tar.bz2 scummvm-rg350-3fe7f2cbe2b70eaa824b7159d94d40c2280006a3.zip | |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'engines/sword2/function.cpp')
| -rw-r--r-- | engines/sword2/function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp index 836b252d6c..07fcaa094b 100644 --- a/engines/sword2/function.cpp +++ b/engines/sword2/function.cpp @@ -2139,7 +2139,7 @@ int32 Logic::fnPlaySequence(int32 *params) { uint32 frameCount = Sword2Engine::isPsx() ? params[1] : 0; - _moviePlayer = makeMoviePlayer(filename, _vm, _vm->_mixer, _vm->_system, frameCount); + _moviePlayer = makeMoviePlayer(filename, _vm, _vm->_system, frameCount); if (_moviePlayer && _moviePlayer->load(filename)) { _moviePlayer->play(_sequenceTextList, _sequenceTextLines, _smackerLeadIn, _smackerLeadOut); |