summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-04-30 21:07:40 +0200
committerTreeki <treeki@gmail.com>2013-04-30 21:07:40 +0200
commitef628fcf234bf456e520e09af086c8dce1d354d3 (patch)
tree88353e9b9ae7760861fe2b9b217eb3816db94a48 /src
parent1813612ed36ee857ce9a5f324c1a9a748ffa00cd (diff)
downloadkamek-ef628fcf234bf456e520e09af086c8dce1d354d3.tar.gz
kamek-ef628fcf234bf456e520e09af086c8dce1d354d3.zip
don't always use settings 0x80000000 when returning to map from palacedude
Diffstat (limited to 'src')
-rw-r--r--src/palaceDude.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/palaceDude.cpp b/src/palaceDude.cpp
index b685cd2..4714e79 100644
--- a/src/palaceDude.cpp
+++ b/src/palaceDude.cpp
@@ -52,9 +52,12 @@ int dPalaceDude_c::onExecute() {
// OSReport("Palace Dude is activated, %d\n", dMsgBoxManager_c::instance->visible);
if (!dMsgBoxManager_c::instance->visible) {
// OSReport("Exiting\n");
- if (settings & 0xF000000)
+ u32 wmsettings = 0;
+ if (settings & 0xF000000) {
SaveGame(0, false);
- ExitStage(WORLD_MAP, 0x80000000, BEAT_LEVEL, MARIO_WIPE);
+ wmsettings = 0x80000000;
+ }
+ ExitStage(WORLD_MAP, wmsettings, BEAT_LEVEL, MARIO_WIPE);
hasExitedStage = true;
}
}