mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-25 22:42:04 +02:00
Change gamestate initialization order - list of owned objects must be
initialized before connecting towns with visiting heroes, but after generateion of starting heroes
This commit is contained in:
@@ -194,6 +194,7 @@ void CGameState::init(const IMapService * mapService, StartInfo * si, Load::Prog
|
||||
initRandomFactionsForPlayers();
|
||||
randomizeMapObjects();
|
||||
placeStartingHeroes();
|
||||
initOwnedObjects();
|
||||
initDifficulty();
|
||||
initHeroes();
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user