1 files changed, 45 insertions, 14 deletions

diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index 536b43a..c691a89 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -374,7 +374,7 @@ void dWMPathManager_c::startMovementTo(dKPPath_s *path) {
 	SpammyReport("moving to path %p [%d,%d to %d,%d]\n", path, path->start->x, path->start->y, path->end->x, path->end->y);
 
 	if (!path->isAvailable) { return; }
-	if (currentNode)
+	if (currentNode && dWMHud_c::instance)
 		dWMHud_c::instance->leftNode();
 
 	calledEnteredNode = false;
@@ -557,7 +557,7 @@ void dWMPathManager_c::moveThroughPath() {
 		float distToEnd = VECMag(&toEndVec);
 		//OSReport("Distance: %f; To:%d,%d; Player:%f,%f; Diff:%f,%f\n", distToEnd, to->x, to->y, player->pos.x, player->pos.y, toEndVec.x, toEndVec.y);
 
-		if (distToEnd < 64.0f) {
+		if (distToEnd < 64.0f && dWMHud_c::instance) {
 			calledEnteredNode = true;
 			dWMHud_c::instance->enteredNode(to);
 		}
@@ -578,15 +578,15 @@ void dWMPathManager_c::moveThroughPath() {
    		isJumping = false;
    		timer = 0.0;
 
-   		SpammyReport("reached path end (%p)\n", to);
+   		SpammyReport("reached path end (%p) with type %d\n", to, to->type);
 
    		bool reallyStop = false;
 
    		if (to->type == dKPNode_s::LEVEL) {
    			// Always stop on levels
    			reallyStop = true;
-   		} else if (to->type == dKPNode_s::CHANGE) {
-			// Never stop on entrances
+   		} else if (to->type == dKPNode_s::CHANGE || to->type == dKPNode_s::WORLD_CHANGE) {
+			// Never stop on entrances or on world changes
 			reallyStop = false;
    		} else if (to->type == dKPNode_s::PASS_THROUGH) {
 			// If there's only one exit here, then stop even though
@@ -602,6 +602,44 @@ void dWMPathManager_c::moveThroughPath() {
 				reallyStop = true;
 		}
 
+		if (to->type == dKPNode_s::WORLD_CHANGE) {
+			// Set the current world info
+			SaveBlock *save = GetSaveFile()->GetBlock(-1);
+
+			OSReport("Activating world change %d\n", to->worldID);
+			const dKPWorldDef_s *world = dScKoopatlas_c::instance->mapData.findWorldDef(to->worldID);
+			if (world) {
+				if (strncmp(save->newerWorldName, world->name, 36) == 0) {
+					OSReport("Already here\n");
+				} else {
+					OSReport("Found!\n");
+					strncpy(save->newerWorldName, world->name, 36);
+					save->newerWorldName[35] = 0;
+					save->currentMapMusic = world->trackID;
+
+					for (int i = 0; i < 2; i++) {
+						save->fsTextColours[i] = world->fsTextColours[i];
+						save->fsHintColours[i] = world->fsHintColours[i];
+						save->hudTextColours[i] = world->hudTextColours[i];
+					}
+
+					save->hudHintH = world->hudHintH;
+					save->hudHintS = world->hudHintS;
+					save->hudHintL = world->hudHintL;
+
+					if (dWMHud_c::instance)
+						dWMHud_c::instance->showFooter();
+				}
+			} else if (to->worldID == 0) {
+				OSReport("No world\n");
+				save->newerWorldName[0] = 0;
+				if (dWMHud_c::instance)
+					dWMHud_c::instance->hideFooter();
+			} else {
+				OSReport("Not found!\n");
+			}
+		}
+
 		if (to->type == dKPNode_s::CHANGE) {
 			// Go to another map
 
@@ -635,15 +673,8 @@ void dWMPathManager_c::moveThroughPath() {
 
 			SaveBlock *save = GetSaveFile()->GetBlock(-1);
 			save->current_path_node = pathLayer->findNodeID(to);
-			if (!calledEnteredNode)
+			if (!calledEnteredNode && dWMHud_c::instance)
 				dWMHud_c::instance->enteredNode();
-
-			if (to->type == dKPNode_s::LEVEL) {
-				NWRWorld nWorld = NewerWorldForLevelID(to->levelNumber[0], to->levelNumber[1]);
-				if (nWorld != UNKNOWN_WORLD) {
-					save->currentNewerWorld = (u8)nWorld;
-				}
-			}
 		} else {
 			startMovementTo(to->getOppositeAvailableExitTo(currentPath));
 			SpammyReport("passthrough node, continuing to next path\n");
@@ -684,7 +715,7 @@ void dWMPathManager_c::activatePoint() {
 
 		isEnteringLevel = true;
 		levelStartWait = 40;
-		enteredLevel = dScKoopatlas_c::instance->levelInfo.search(w, l);
+		enteredLevel = dScKoopatlas_c::instance->levelInfo.searchBySlot(w, l);
 	}
 }