diff options
| author | Treeki <treeki@gmail.com> | 2012-08-30 05:37:09 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-08-30 05:37:09 +0200 |
| commit | a50b7bf422d8ba402fedec7cfda6ffc77d335ac2 (patch) | |
| tree | a8c2eda8bc4ee6cdc7baafddac76a7c56c832af7 /src/koopatlas | |
| parent | 5d5eb65d2dc63f4fe4297972b4259cf5ab08ecaa (diff) | |
| download | kamek-a50b7bf422d8ba402fedec7cfda6ffc77d335ac2.tar.gz kamek-a50b7bf422d8ba402fedec7cfda6ffc77d335ac2.zip | |
quick fix so the WORLD_MAP settings don't conflict with nintendo's
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 fa618b0..0ff9473 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); @@ -539,7 +539,7 @@ void dWMPathManager_c::moveThroughPath() { OSReport("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 |