SHERLOCK: Beginnings of animation sequence loop

2 files changed, 21 insertions, 21 deletions

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0b651bbb69..90a93de1b1 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -45,21 +45,21 @@ void ScalpelEngine::initialize() {
  * Show the opening sequence
  */
 void ScalpelEngine::showOpening() {
-	if (!_events->isKeyPressed())
-		showCityCutscene();
-	if (!_events->isKeyPressed())
-		showAlleyCutscene();
-	if (!_events->isKeyPressed())
-		showStreetCutscene();
-	if (!_events->isKeyPressed())
-		showOfficeCutscene();
+	if (!showCityCutscene())
+		return;
+	if (!showAlleyCutscene())
+		return;
+	if (!showStreetCutscene())
+		return;
+	if (!showOfficeCutscene())
+		return;
 
 	_events->clearEvents();
 	_sound->stopMusic();
 }
 
-void ScalpelEngine::showCityCutscene() {
-	byte palette[PALETTE_SIZE];
+bool ScalpelEngine::showCityCutscene() {
+//	byte palette[PALETTE_SIZE];
 	
 	_sound->playMusic("prolog1.mus");
 	_titleOverride = "title.lib";
@@ -67,21 +67,21 @@ void ScalpelEngine::showCityCutscene() {
 	_animation->playPrologue("26open1", 1, 255, true, 2);
 
 	// TODO
+	return true;
 }
 
-void ScalpelEngine::showAlleyCutscene() {
-
+bool ScalpelEngine::showAlleyCutscene() {
+	return true;
 }
 
-void ScalpelEngine::showStreetCutscene() {
-
+bool ScalpelEngine::showStreetCutscene() {
+	return true;
 }
 
-void ScalpelEngine::showOfficeCutscene() {
-
+bool ScalpelEngine::showOfficeCutscene() {
+	return true;
 }
 
-
 } // End of namespace Scalpel
 
 } // End of namespace Scalpel
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index 5da33e1d52..584bd78a20 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -31,10 +31,10 @@ namespace Scalpel {
 
 class ScalpelEngine : public SherlockEngine {
 private:
-	void showCityCutscene();
-	void showAlleyCutscene();
-	void showStreetCutscene();
-	void showOfficeCutscene();
+	bool showCityCutscene();
+	bool showAlleyCutscene();
+	bool showStreetCutscene();
+	bool showOfficeCutscene();
 protected:
 	virtual void initialize();