summaryrefslogtreecommitdiff
path: root/src/koopatlas/core.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-09-27 22:59:41 -0500
committerColin Noga <Tempus@chronometry.ca>2012-09-27 22:59:41 -0500
commit64f38f642113ac4bd5b1d96e76c9ae97965bc416 (patch)
tree99d9bbf4d577ae2d8a79fcb5f7101df1b57398fe /src/koopatlas/core.cpp
parentf9afbf1109b30bbc6011e81109b7e11961a4361a (diff)
parentb3c37e5a9ef81250d6554fcbb8089154b4940c9f (diff)
downloadkamek-64f38f642113ac4bd5b1d96e76c9ae97965bc416.tar.gz
kamek-64f38f642113ac4bd5b1d96e76c9ae97965bc416.zip
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
-rw-r--r--src/koopatlas/core.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index c20d715..a48a565 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -970,13 +970,10 @@ void dScKoopatlas_c::startLevel(dLevelInfo_c::entry_s *entry) {
sl.unk4 = 0;
sl.purpose = 0;
- sl.world1 = entry->world;
- sl.world2 = entry->world;
- sl.level1 = entry->level;
- sl.level2 = entry->level;
-
- // hopefully this will fix the Star Coin issues
- SetSomeConditionShit(entry->world, entry->level, 2);
+ sl.world1 = entry->worldSlot;
+ sl.world2 = entry->worldSlot;
+ sl.level1 = entry->levelSlot;
+ sl.level2 = entry->levelSlot;
ActivateWipe(WIPE_MARIO);