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

Change gamestate initialization order - list of owned objects must be

Browse Source 
initialized before connecting towns with visiting heroes, but after
generateion of starting heroes
This commit is contained in:
Ivan Savenko 2024-08-29 12:42:36 +00:00
parent 32ad9c1902
commit d0b3bb95b2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/gameState/CGameState.cpp
View File

@ -194,6 +194,7 @@ void CGameState::init(const IMapService * mapService, StartInfo * si, Load::Prog
initRandomFactionsForPlayers(); initRandomFactionsForPlayers();
randomizeMapObjects(); randomizeMapObjects();
placeStartingHeroes(); placeStartingHeroes();
initOwnedObjects();
initDifficulty(); initDifficulty();
initHeroes(); initHeroes();
initStartingBonus(); initStartingBonus();
@ -492,8 +493,14 @@ void CGameState::randomizeMapObjects()
} }
} }
} }
}
}
if (object->getOwner().isValidPlayer()) void CGameState::initOwnedObjects()
{
for(CGObjectInstance *object : map->objects)
{
if (object && object->getOwner().isValidPlayer())
getPlayerState(object->getOwner())->addOwnedObject(object); getPlayerState(object->getOwner())->addOwnedObject(object);
} }
} }

1
lib/gameState/CGameState.h
View File

@ -181,6 +181,7 @@ private:
void initGlobalBonuses(); void initGlobalBonuses();
void initGrailPosition(); void initGrailPosition();
void initRandomFactionsForPlayers(); void initRandomFactionsForPlayers();
void initOwnedObjects();
void randomizeMapObjects(); void randomizeMapObjects();
void initPlayerStates(); void initPlayerStates();
void placeStartingHeroes(); void placeStartingHeroes();