summaryrefslogtreecommitdiff
path: root/src/cutScene.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/cutScene.cpp')
-rw-r--r--src/cutScene.cpp4
1 files changed, 3 insertions, 1 deletions
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);