diff options
Diffstat (limited to '')
| -rw-r--r-- | src/worldmap.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
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
|