From a6e653e973d1b4ec402e5b7f34093849bbd60745 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Wed, 19 Sep 2012 05:04:13 +0200
Subject: made cutscene skippable AND go to worldmap at end, for testing

---
 src/cutScene.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/cutScene.cpp b/src/cutScene.cpp
index cde9c2c..cb0151b 100644
--- a/src/cutScene.cpp
+++ b/src/cutScene.cpp
@@ -85,13 +85,15 @@ int dScCutScene_c::onExecute() {
 	// now, do all other processing
 
 	if (currentScene >= 0) {
-		if (!layout->isAnyAnimOn()) {
+		int nowPressed = Remocon_GetPressed(GetActiveRemocon());
+		if (!layout->isAnyAnimOn() || nowPressed & WPAD_TWO) {
 			// we're at the end
 			// what now?
 
 			if ((currentScene + 1) == data->sceneCount) {
 				// we're TOTALLY done!
 				OSReport("playback complete\n");
+				DoSceneChange(WORLD_MAP, 0, 0);
 			} else {
 				nextScene = currentScene + 1;
 				OSReport("switching to scene %d\n", nextScene);
-- 
cgit v1.2.3