aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-01 16:53:22 -1000
committerPaul Gilbert2015-05-01 16:53:22 -1000
commit42a99354f9d0c4719e955008f57bf433fdbeabb3 (patch)
treea3dfe76d7fc08ecc2aecdc6b59b6d6983fe82265 /engines
parent1e2ed9e3bc98ad7b0295df8484710a8223bfd01d (diff)
downloadscummvm-rg350-42a99354f9d0c4719e955008f57bf433fdbeabb3.tar.gz
scummvm-rg350-42a99354f9d0c4719e955008f57bf433fdbeabb3.tar.bz2
scummvm-rg350-42a99354f9d0c4719e955008f57bf433fdbeabb3.zip
SHERLOCK: Rename playPrologue to play
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/animation.cpp2
-rw-r--r--engines/sherlock/animation.h2
-rw-r--r--engines/sherlock/scalpel/scalpel.cpp46
-rw-r--r--engines/sherlock/talk.cpp2
4 files changed, 26 insertions, 26 deletions
diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index e70bc84ff8..1d84a30c0f 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -64,7 +64,7 @@ static const int NO_FRAMES = FRAMES_END;
Animation::Animation(SherlockEngine *vm): _vm(vm) {
}
-bool Animation::playPrologue(const Common::String &filename, int minDelay, int fade,
+bool Animation::play(const Common::String &filename, int minDelay, int fade,
bool setPalette, int speed) {
Events &events = *_vm->_events;
Screen &screen = *_vm->_screen;
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index da4c5baad7..3d87cb0a91 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -39,7 +39,7 @@ public:
public:
Animation(SherlockEngine *vm);
- bool playPrologue(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
+ bool play(const Common::String &filename, int minDelay, int fade, bool setPalette, int speed);
};
} // End of namespace Sherlock
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index a90408fe11..3fe094bcf4 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -255,7 +255,7 @@ bool ScalpelEngine::showCityCutscene() {
_sound->playMusic("prolog1.mus");
_titleOverride = "title.lib";
_soundOverride = "title.snd";
- bool finished = _animation->playPrologue("26open1", 1, 255, true, 2);
+ bool finished = _animation->play("26open1", 1, 255, true, 2);
if (finished) {
ImageFile titleImages("title2.vgs", true);
@@ -280,7 +280,7 @@ bool ScalpelEngine::showCityCutscene() {
}
if (finished)
- finished = _animation->playPrologue("26open2", 1, 0, false, 2);
+ finished = _animation->play("26open2", 1, 0, false, 2);
if (finished) {
ImageFile titleImages("title.vgs", true);
@@ -331,9 +331,9 @@ bool ScalpelEngine::showAlleyCutscene() {
_titleOverride = "TITLE.LIB";
_soundOverride = "TITLE.SND";
- bool finished = _animation->playPrologue("27PRO1", 1, 3, true, 2);
+ bool finished = _animation->play("27PRO1", 1, 3, true, 2);
if (finished)
- finished = _animation->playPrologue("27PRO2", 1, 0, false, 2);
+ finished = _animation->play("27PRO2", 1, 0, false, 2);
if (finished) {
showLBV("scream.lbv");
@@ -341,7 +341,7 @@ bool ScalpelEngine::showAlleyCutscene() {
}
if (finished)
- finished = _animation->playPrologue("27PRO3", 1, 0, true, 2);
+ finished = _animation->play("27PRO3", 1, 0, true, 2);
if(finished) {
_screen->getPalette(palette);
@@ -370,10 +370,10 @@ bool ScalpelEngine::showStreetCutscene() {
_sound->playMusic("PROLOG3.MUS");
- bool finished = _animation->playPrologue("14KICK", 1, 3, true, 2);
+ bool finished = _animation->play("14KICK", 1, 3, true, 2);
if (finished)
- finished = _animation->playPrologue("14NOTE", 1, 0, false, 2);
+ finished = _animation->play("14NOTE", 1, 0, false, 2);
_titleOverride = "";
_soundOverride = "";
@@ -423,9 +423,9 @@ bool ScalpelEngine::showOfficeCutscene() {
_titleOverride = "TITLE2.LIB";
_soundOverride = "TITLE.SND";
- bool finished = _animation->playPrologue("COFF1", 1, 3, true, 3);
+ bool finished = _animation->play("COFF1", 1, 3, true, 3);
if (finished)
- finished = _animation->playPrologue("COFF2", 1, 0, false, 3);
+ finished = _animation->play("COFF2", 1, 0, false, 3);
if (finished) {
showLBV("note.lbv");
@@ -445,10 +445,10 @@ bool ScalpelEngine::showOfficeCutscene() {
}
if (finished)
- finished = _animation->playPrologue("COFF3", 1, 0, true, 3);
+ finished = _animation->play("COFF3", 1, 0, true, 3);
if (finished)
- finished = _animation->playPrologue("COFF4", 1, 0, false, 3);
+ finished = _animation->play("COFF4", 1, 0, false, 3);
if (finished)
finished = scrollCredits();
@@ -541,8 +541,8 @@ void ScalpelEngine::startScene() {
// Blackwood's capture
_res->addToCache("final2.vda", "epilogue.lib");
_res->addToCache("final2.vdx", "epilogue.lib");
- _animation->playPrologue("final1", 1, 3, true, 4);
- _animation->playPrologue("final2", 1, 0, false, 4);
+ _animation->play("final1", 1, 3, true, 4);
+ _animation->play("final2", 1, 0, false, 4);
break;
case 52:
@@ -558,8 +558,8 @@ void ScalpelEngine::startScene() {
_res->addToCache("finale4.vda", "EPILOG2.lib");
_res->addToCache("finale4.vdx", "EPILOG2.lib");
- _animation->playPrologue("finalr1", 1, 3, true, 4);
- _animation->playPrologue("finalr2", 1, 0, false, 4);
+ _animation->play("finalr1", 1, 3, true, 4);
+ _animation->play("finalr2", 1, 0, false, 4);
if (!_res->isInCache("finale2.vda")) {
// Finale file isn't cached
@@ -571,12 +571,12 @@ void ScalpelEngine::startScene() {
_res->addToCache("finale4.vdx", "EPILOG2.lib");
}
- _animation->playPrologue("finale1", 1, 0, false, 4);
- _animation->playPrologue("finale2", 1, 0, false, 4);
- _animation->playPrologue("finale3", 1, 0, false, 4);
+ _animation->play("finale1", 1, 0, false, 4);
+ _animation->play("finale2", 1, 0, false, 4);
+ _animation->play("finale3", 1, 0, false, 4);
_useEpilogue2 = true;
- _animation->playPrologue("finale4", 1, 0, false, 4);
+ _animation->play("finale4", 1, 0, false, 4);
_useEpilogue2 = false;
break;
@@ -587,9 +587,9 @@ void ScalpelEngine::startScene() {
_res->addToCache("SUBWAY3.vda", "epilogue.lib");
_res->addToCache("SUBWAY3.vdx", "epilogue.lib");
- _animation->playPrologue("SUBWAY1", 1, 3, true, 4);
- _animation->playPrologue("SUBWAY2", 1, 0, false, 4);
- _animation->playPrologue("SUBWAY3", 1, 0, false, 4);
+ _animation->play("SUBWAY1", 1, 3, true, 4);
+ _animation->play("SUBWAY2", 1, 0, false, 4);
+ _animation->play("SUBWAY3", 1, 0, false, 4);
// Set fading to direct fade temporary so the transition goes quickly.
_scene->_tempFadeStyle = _screen->_fadeStyle ? 257 : 256;
@@ -598,7 +598,7 @@ void ScalpelEngine::startScene() {
case 70:
// Brumwell suicide
- _animation->playPrologue("suicid", 1, 3, true, 4);
+ _animation->play("suicid", 1, 3, true, 4);
break;
default:
break;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 7464e4d341..603f47a446 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1353,7 +1353,7 @@ void Talk::doScript(const Common::String &script) {
for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx)
tempString += str[idx];
- anim.playPrologue(tempString, 1, 3, true, 4);
+ anim.play(tempString, 1, 3, true, 4);
break;
case ADD_ITEM_TO_INVENTORY: