games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-02 00:10:22 +02:00
Code Issues Releases Activity

Fix crash on rmg generation (regression from previous commit)

Browse Source
This commit is contained in:
Ivan Savenko 2024-08-21 18:19:58 +00:00
parent 475a20124f
commit 4386339354
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/gameState/CGameState.cpp
View File

@ -312,11 +312,10 @@ void CGameState::initNewGame(const IMapService * mapService, bool allowSavingRan
std::unique_ptr<CMap> randomMap = mapGenerator.generate(); std::unique_ptr<CMap> randomMap = mapGenerator.generate();
progressTracking.exclude(mapGenerator); progressTracking.exclude(mapGenerator);
map = randomMap.release();
// Update starting options // Update starting options
for(int i = 0; i < map->players.size(); ++i) for(int i = 0; i < randomMap->players.size(); ++i)
{ {
const auto & playerInfo = map->players[i]; const auto & playerInfo = randomMap->players[i];
if(playerInfo.canAnyonePlay()) if(playerInfo.canAnyonePlay())
{ {
PlayerSettings & playerSettings = scenarioOps->playerInfos[PlayerColor(i)]; PlayerSettings & playerSettings = scenarioOps->playerInfos[PlayerColor(i)];
@ -363,6 +362,8 @@ void CGameState::initNewGame(const IMapService * mapService, bool allowSavingRan
} }
} }
map = randomMap.release();
logGlobal->info("Generated random map in %i ms.", sw.getDiff()); logGlobal->info("Generated random map in %i ms.", sw.getDiff());
} }
else else