diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-08-30 13:26:29 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-08-30 13:26:29 -0500 |
| commit | d2ac274c00a448cefa4c82c079ba0a75f0b8fbba (patch) | |
| tree | 616bdb246ffda022b4099dda55283cf61e603fe1 /src/koopatlas/pathmanager.cpp | |
| parent | 463e256e6a239facb902da4566502a14684e1b94 (diff) | |
| parent | 2b5bc0f0397e50b7cad585196e403c99d27b6207 (diff) | |
| download | kamek-d2ac274c00a448cefa4c82c079ba0a75f0b8fbba.tar.gz kamek-d2ac274c00a448cefa4c82c079ba0a75f0b8fbba.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
| -rw-r--r-- | src/koopatlas/pathmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index f8a1854..ffc4dfd 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -26,7 +26,7 @@ void dWMPathManager_c::setup() { // Figure out what path node to start at if (dScKoopatlas_c::instance->settings & 0x10000000) { // Start off from a "Change" - u8 changeID = dScKoopatlas_c::instance->settings & 0xFF; + u8 changeID = (dScKoopatlas_c::instance->settings >> 20) & 0xFF; SpammyReport("entering at Change ID %d\n", changeID); SpammyReport("Path layer: %p\n", pathLayer); SpammyReport("Node count: %d\n", pathLayer->nodeCount); @@ -545,7 +545,7 @@ void dWMPathManager_c::moveThroughPath() { SpammyReport("Change to map ID %d (%s), entrance ID %d\n", save->current_world, to->destMap, to->foreignID); - DoSceneChange(WORLD_MAP, 0x10000000 | to->foreignID, 0); + DoSceneChange(WORLD_MAP, 0x10000000 | (to->foreignID << 20), 0); } else if (reallyStop) { // Stop here |