[Scummvm-cvs-logs] SF.net SVN: scummvm:[51879] scummvm/trunk/engines/gob/inter_bargon.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sun Aug 8 02:48:24 CEST 2010
Revision: 51879
http://scummvm.svn.sourceforge.net/scummvm/?rev=51879&view=rev
Author: drmccoy
Date: 2010-08-08 00:48:23 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
GOB: Make the Bargon Attack intro use the new VideoPlayer interface
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter_bargon.cpp
Modified: scummvm/trunk/engines/gob/inter_bargon.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_bargon.cpp 2010-08-08 00:47:54 UTC (rev 51878)
+++ scummvm/trunk/engines/gob/inter_bargon.cpp 2010-08-08 00:48:23 UTC (rev 51879)
@@ -72,17 +72,47 @@
}
void Inter_Bargon::oBargon_intro0(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scaa", 0, 160)) {
- _vm->_vidPlayer->primaryPlay(0, 92, 27, 0, 0, 0);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 0;
+ props.y = 160;
+ props.startFrame = 0;
+ props.lastFrame = 92;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scaa", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+ _vm->_vidPlayer->closeVideo(slot);
}
void Inter_Bargon::oBargon_intro1(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scaa", 0, 160)) {
- _vm->_vidPlayer->primaryPlay(0, -1, 27, 0, 0, 0, 0, 0, true, 23);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 0;
+ props.y = 160;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+ props.fade = true;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scaa", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+
+ props.startFrame = -1;
+ props.lastFrame = 23;
+ props.fade = false;
+
+ _vm->_vidPlayer->play(slot, props);
+
+ _vm->_vidPlayer->closeVideo(slot);
}
void Inter_Bargon::oBargon_intro2(OpGobParams ¶ms) {
@@ -178,45 +208,106 @@
}
void Inter_Bargon::oBargon_intro4(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scba", 191, 54)) {
- _vm->_vidPlayer->primaryPlay(0, -1, 27, 0, 0, 0, 0, 0, true);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 191;
+ props.y = 54;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+ props.fade = true;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scba", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+ _vm->_vidPlayer->closeVideo(slot);
}
void Inter_Bargon::oBargon_intro5(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scbb", 191, 54)) {
- _vm->_vidPlayer->primaryPlay(0, -1, 27, 0, 0, 0);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 191;
+ props.y = 54;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scbb", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+ _vm->_vidPlayer->closeVideo(slot);
}
void Inter_Bargon::oBargon_intro6(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scbc", 191, 54)) {
- _vm->_vidPlayer->primaryPlay(0, -1, 27, 0, 0, 0);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 191;
+ props.y = 54;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scbc", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+ _vm->_vidPlayer->closeVideo(slot);
}
void Inter_Bargon::oBargon_intro7(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scbf", 191, 54)) {
- _vm->_vidPlayer->primaryPlay(0, -1, 27, 0, 0, 0);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 191;
+ props.y = 54;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scbf", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+ _vm->_vidPlayer->closeVideo(slot);
}
void Inter_Bargon::oBargon_intro8(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scbc", 191, 54)) {
- _vm->_vidPlayer->primaryPlay(0, -1, 27, 0, 0, 0);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 191;
+ props.y = 54;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scbc", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+ _vm->_vidPlayer->closeVideo(slot);
}
void Inter_Bargon::oBargon_intro9(OpGobParams ¶ms) {
- if (_vm->_vidPlayer->primaryOpen("scbd", 191, 54)) {
- _vm->_vidPlayer->primaryPlay(0, -1, 27, 0, 0, 0);
- _vm->_vidPlayer->primaryClose();
- }
+ VideoPlayer::Properties props;
+
+ props.x = 191;
+ props.y = 54;
+ props.palCmd = 0;
+ props.palStart = 0;
+ props.palEnd = 0;
+
+ int slot;
+ if ((slot = _vm->_vidPlayer->openVideo(true, "scbd", props)) < 0)
+ return;
+
+ _vm->_vidPlayer->play(slot, props);
+ _vm->_vidPlayer->closeVideo(slot);
}
} // End of namespace Gob
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list