From 72b2cb8e1bcb9970136efc8dc57b20b95ff7d082 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Sun, 13 Mar 2011 02:34:58 +0100
Subject: compiles now! untested, though. also did some work on
 dWMResourceMng_c

---
 src/worldmap.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/worldmap.cpp')

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index e0e3d58..45d3d24 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -249,15 +249,23 @@ int dScNewerWorldMap_c::onExecute() {
 
 		/**********************************************************************/
 		// STATE_END_DVD : Wait for files to load, end DVD
-		case STATE_END_DVD:
+		//  Also, load the WM Set files
+		case STATE_END_DVD: {
+
+			bool didEndDVD = false, didWMSetLoad = false;
 
 			if (!DVD_StillLoading(GetDVDClass2())) {
 				if (DVD_End()) {
-					this->state = STATE_SETUP_WAIT;
+					didEndDVD = true;
 				}
 			}
 
-			break;
+			didWMSetLoad = resMng.loadSet("SMGoldwood");
+
+			if (didEndDVD && didWMSetLoad)
+				this->state = STATE_SETUP_WAIT;
+
+		} break;
 
 		/**********************************************************************/
 		// STATE_SETUP_WAIT : Waiting for the world map managers to be set up
-- 
cgit v1.2.3