diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index 80920da..f9e1c85 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -6460,18 +6460,9 @@ void Game::applyState() } #endif - worldMapRender = 0; - dsq->continuity.worldMap.revealMap(sceneToLoad); - - debugLog("Creating WorldMapRender"); - if(dsq->mod.isActive() && dsq->mod.mapRevealMethod != REVEAL_UNSPECIFIED) - WorldMapRender::setRevealMethod(dsq->mod.mapRevealMethod); - else - WorldMapRender::setRevealMethod((WorldMapRevealMethod)dsq->user.video.worldMapRevealMethod); - - worldMapRender = new WorldMapRender; - addRenderObject(worldMapRender, LR_WORLDMAP); - +/* + if (liFlag == 100) + */ if (verbose) debugLog("Creating Avatar"); avatar = new Avatar(); @@ -6535,6 +6526,8 @@ void Game::applyState() if (verbose) debugLog("...Done"); backupSceneColor = sceneColor; + dsq->continuity.worldMap.revealMap(sceneName); + colorTest(); if (!warpAreaType.empty()) @@ -6663,6 +6656,18 @@ void Game::applyState() timerText->followCamera = 1; addRenderObject(timerText, LR_MINIMAP); + worldMapRender = 0; + + if(dsq->mod.isActive() && dsq->mod.mapRevealMethod != REVEAL_UNSPECIFIED) + WorldMapRender::setRevealMethod(dsq->mod.mapRevealMethod); + else + WorldMapRender::setRevealMethod((WorldMapRevealMethod)dsq->user.video.worldMapRevealMethod); + + worldMapRender = new WorldMapRender; + addRenderObject(worldMapRender, LR_WORLDMAP); + // to hide minimap + //miniMapRender->position += Vector(800,0); + sceneToLoad=""; if (!fromScene.empty())