diff options
| author | Treeki <treeki@gmail.com> | 2012-09-19 05:04:13 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-09-19 05:04:13 +0200 |
| commit | a6e653e973d1b4ec402e5b7f34093849bbd60745 (patch) | |
| tree | e297fabe3bebbf4100269f845ea784353f3ceb04 /src | |
| parent | c966111a279251fb7c2499e5ed6eee464411006d (diff) | |
| download | kamek-a6e653e973d1b4ec402e5b7f34093849bbd60745.tar.gz kamek-a6e653e973d1b4ec402e5b7f34093849bbd60745.zip | |
made cutscene skippable AND go to worldmap at end, for testing
Diffstat (limited to 'src')
| -rw-r--r-- | src/cutScene.cpp | 4 |
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); |