From c2b92e563229d633fefcabb4544b3bf73dc40db0 Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Mon, 13 May 2013 09:57:02 -0500
Subject: Fixes to world map messages, roll your own model, shy guy giant and
 topman speeds

---
 src/koopatlas/core.cpp        | 16 ++++++++--------
 src/koopatlas/pathmanager.cpp |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/koopatlas')

diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index 6618650..6101197 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -539,14 +539,14 @@ void dScKoopatlas_c::executeState_Normal() {
 		state.setState(&StateID_CSMenu);
 		hud->hideAll();
 #ifdef NEWER_DEBUG
-	} else if (nowPressed & WPAD_MINUS) {
-		pathManager.unlockAllPaths(2);
-	} else if (nowPressed & WPAD_A) {
-		pathManager.unlockAllPaths(0);
-		SaveBlock *save = GetSaveFile()->GetBlock(-1);
-		for (int w = 0; w < 6; w++)
-			for (int l = 0; l < 6; l++)
-				save->SetLevelCondition(w, l, COND_COIN_ALL);
+	// } else if (nowPressed & WPAD_MINUS) {
+	// 	pathManager.unlockAllPaths(2);
+	// } else if (nowPressed & WPAD_A) {
+	// 	pathManager.unlockAllPaths(0);
+	// 	SaveBlock *save = GetSaveFile()->GetBlock(-1);
+	// 	for (int w = 0; w < 6; w++)
+	// 		for (int l = 0; l < 6; l++)
+	// 			save->SetLevelCondition(w, l, COND_COIN_ALL);
 #endif
 	} 
 }
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index b1108b8..271bcbe 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -243,8 +243,10 @@ void dWMPathManager_c::setup() {
 				completionMessageType = CMP_MSG_EXITS;
 			}
 		}
-		if (CanFinishWorld && flag == totalFlag)
-			completionMessageType = CMP_MSG_WORLD;
+		if (CanFinishWorld && flag == totalFlag) {
+			shouldRequestSave = true;
+			completionMessageType = CMP_MSG_WORLD; 
+		}
 
 		if (CanFinishAlmostAllCoins) {
 			if ((conds & COND_COIN_ALL) == COND_COIN_ALL)
-- 
cgit v1.2.3