diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-12-13 21:40:38 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-12-13 21:40:38 -0600 |
| commit | b11c616d45fe24fbcc1bc5fbdbf8a5ffcca2ce8c (patch) | |
| tree | cf2b4d305bec099b26c0a72d5ccf06b9245498f8 | |
| parent | 1ecc9bbfe65096b6f5601385b24095afcc918563 (diff) | |
| parent | d2310fd118a46e8e530764fb8eea6dac7c6598e1 (diff) | |
| download | kamek-b11c616d45fe24fbcc1bc5fbdbf8a5ffcca2ce8c.tar.gz kamek-b11c616d45fe24fbcc1bc5fbdbf8a5ffcca2ce8c.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
| -rw-r--r-- | src/cutScene.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/cutScene.cpp b/src/cutScene.cpp index 32f4eb3..cac1f10 100644 --- a/src/cutScene.cpp +++ b/src/cutScene.cpp @@ -93,7 +93,15 @@ int dScCutScene_c::onExecute() { if ((currentScene + 1) == data->sceneCount) { // we're TOTALLY done! OSReport("playback complete\n"); - DoSceneChange(WORLD_MAP, 0x80000000, 0); + int nsmbwMovieType = settings & 3; + switch (nsmbwMovieType) { + case 0: + DoSceneChange(WORLD_MAP, 0x80000000, 0); + break; + case 1: + StartTitleScreenStage(false, 0); + break; + } } else { nextScene = currentScene + 1; OSReport("switching to scene %d\n", nextScene); |