diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/gob/inter_bargon.cpp | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/gob/inter_bargon.cpp')
-rw-r--r-- | engines/gob/inter_bargon.cpp | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp index ffbe9e45ea..492ea198a1 100644 --- a/engines/gob/inter_bargon.cpp +++ b/engines/gob/inter_bargon.cpp @@ -33,10 +33,10 @@ #include "gob/dataio.h" #include "gob/draw.h" #include "gob/game.h" -#include "gob/imd.h" #include "gob/palanim.h" #include "gob/sound.h" #include "gob/video.h" +#include "gob/videoplayer.h" namespace Gob { @@ -717,11 +717,17 @@ const char *Inter_Bargon::getOpcodeGoblinDesc(int i) { } void Inter_Bargon::oBargon_intro0(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scaa", 0, 160, 0, 92, 0, 1); + if (_vm->_vidPlayer->openVideo("scaa", 0, 160)) { + _vm->_vidPlayer->play(0, 92, 27, 0, 0, 0); + _vm->_vidPlayer->closeVideo(); + } } void Inter_Bargon::oBargon_intro1(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scaa", 0, 160, 0, -23, 1, 1); + if (_vm->_vidPlayer->openVideo("scaa", 0, 160)) { + _vm->_vidPlayer->play(0, -1, 27, 0, 0, 0, 0, 0, true, 23); + _vm->_vidPlayer->closeVideo(); + } } void Inter_Bargon::oBargon_intro2(OpGobParams ¶ms) { @@ -813,27 +819,45 @@ void Inter_Bargon::oBargon_intro3(OpGobParams ¶ms) { } void Inter_Bargon::oBargon_intro4(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scba", 191, 54, 0, 0, 1, 1); + if (_vm->_vidPlayer->openVideo("scba", 191, 54)) { + _vm->_vidPlayer->play(0, -1, 27, 0, 0, 0, 0, 0, true); + _vm->_vidPlayer->closeVideo(); + } } void Inter_Bargon::oBargon_intro5(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scbb", 191, 54, 0, 0, 0, 1); + if (_vm->_vidPlayer->openVideo("scbb", 191, 54)) { + _vm->_vidPlayer->play(0, -1, 27, 0, 0, 0); + _vm->_vidPlayer->closeVideo(); + } } void Inter_Bargon::oBargon_intro6(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scbc", 191, 54, 0, 0, 0, 1); + if (_vm->_vidPlayer->openVideo("scbc", 191, 54)) { + _vm->_vidPlayer->play(0, -1, 27, 0, 0, 0); + _vm->_vidPlayer->closeVideo(); + } } void Inter_Bargon::oBargon_intro7(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scbf", 191, 54, 0, 0, 0, 1); + if (_vm->_vidPlayer->openVideo("scbf", 191, 54)) { + _vm->_vidPlayer->play(0, -1, 27, 0, 0, 0); + _vm->_vidPlayer->closeVideo(); + } } void Inter_Bargon::oBargon_intro8(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scbc", 191, 54, 0, 0, 0, 1); + if (_vm->_vidPlayer->openVideo("scbc", 191, 54)) { + _vm->_vidPlayer->play(0, -1, 27, 0, 0, 0); + _vm->_vidPlayer->closeVideo(); + } } void Inter_Bargon::oBargon_intro9(OpGobParams ¶ms) { - _vm->_imdPlayer->play("scbd", 191, 54, 0, 0, 0, 1); + if (_vm->_vidPlayer->openVideo("scbd", 191, 54)) { + _vm->_vidPlayer->play(0, -1, 27, 0, 0, 0); + _vm->_vidPlayer->closeVideo(); + } } } // End of namespace Gob |