summaryrefslogtreecommitdiff
path: root/src/koopatlas
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2013-05-13 09:58:57 -0500
committerColin Noga <Tempus@chronometry.ca>2013-05-13 09:58:57 -0500
commit9cb933ac3b20c3817c44534256285e3e87e266ec (patch)
treec59514c98316ce5db4868c8d365e9bb2a083263a /src/koopatlas
parentc2b92e563229d633fefcabb4544b3bf73dc40db0 (diff)
parent55b1b23dde3d201375da97ed009968bbf5443586 (diff)
downloadkamek-9cb933ac3b20c3817c44534256285e3e87e266ec.tar.gz
kamek-9cb933ac3b20c3817c44534256285e3e87e266ec.zip
merge model
Diffstat (limited to '')
-rw-r--r--src/koopatlas/core.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index 6101197..c6b0aef 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -408,7 +408,7 @@ int dScKoopatlas_c::onCreate() {
save->current_world = 6;
}
- if (MaybeFinishingLevel[0] == 7 && MaybeFinishingLevel[1] == 24) {
+ if (MaybeFinishingLevel[0] == 7 && MaybeFinishingLevel[1] == 24 && save->CheckLevelCondition(7, 24, COND_NORMAL)) {
currentMapID = 7; // KoopaPlanetUnd
save->current_world = 7;
isAfter8Castle = true;