mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 14:09:06 +00:00
Code Issues Releases Wiki Activity

Revert "Fix crash when adding a gem in entity init()", broke world map.

Browse source 
This reverts commit 17b8cd2079.
This commit is contained in:
fgenesis 2014-08-15 21:18:43 +02:00
parent 07807bfa36
commit e8ff469205
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Aquaria/Game.cpp
View file

@ -6460,18 +6460,9 @@ void Game::applyState()
} }
#endif #endif
worldMapRender = 0; /*
dsq->continuity.worldMap.revealMap(sceneToLoad); if (liFlag == 100)
*/
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 (verbose) debugLog("Creating Avatar"); if (verbose) debugLog("Creating Avatar");
avatar = new Avatar(); avatar = new Avatar();
@ -6535,6 +6526,8 @@ void Game::applyState()
if (verbose) debugLog("...Done"); if (verbose) debugLog("...Done");
backupSceneColor = sceneColor; backupSceneColor = sceneColor;
dsq->continuity.worldMap.revealMap(sceneName);
colorTest(); colorTest();
if (!warpAreaType.empty()) if (!warpAreaType.empty())
@ -6663,6 +6656,18 @@ void Game::applyState()
timerText->followCamera = 1; timerText->followCamera = 1;
addRenderObject(timerText, LR_MINIMAP); 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=""; sceneToLoad="";
if (!fromScene.empty()) if (!fromScene.empty())