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

Next set of fixes, mostly for deserialization.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-02-22 09:47:25 +00:00
parent 1458cf64c2
commit a46ad0b7ef
16 changed files with 144 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/CGameState.cpp
View File

@ -2851,6 +2851,25 @@ bmap<ui32, ConstTransitivePtr<CGHeroInstance> > CGameState::unusedHeroesFromPool
}
void CGameState::buildBonusSystemTree()
{
buildGlobalTeamPlayerTree();
attachArmedObjects();
BOOST_FOREACH(CGTownInstance *t, map->towns)
{
t->deserializationFix();
}
// CStackInstance <-> CCreature, CStackInstance <-> CArmedInstance, CArtifactInstance <-> CArtifact
// are provided on initializing / deserializing
}
void CGameState::deserializationFix()
{
buildGlobalTeamPlayerTree();
attachArmedObjects();
}
void CGameState::buildGlobalTeamPlayerTree()
{
for(std::map<ui8, TeamState>::iterator k=teams.begin(); k!=teams.end(); ++k)
{
@ -2863,33 +2882,16 @@ void CGameState::buildBonusSystemTree()
assert(p);
p->attachTo(t);
}
}
}
void CGameState::attachArmedObjects()
{
BOOST_FOREACH(CGObjectInstance *obj, map->objects)
{
if(CArmedInstance *armed = dynamic_cast<CArmedInstance*>(obj))
{
CBonusSystemNode *whereToAttach = armed->tempOwner < PLAYER_LIMIT
? getPlayer(armed->tempOwner)
: &globalEffects;
if(armed->ID == TOWNI_TYPE)
{
CGTownInstance *town = static_cast<CGTownInstance*>(armed);
town->townAndVis.attachTo(whereToAttach);
}
else
armed->attachTo(whereToAttach);
}
armed->whatShouldBeAttached()->attachTo(armed->whereShouldBeAttached(this));
}
BOOST_FOREACH(CGTownInstance *t, map->towns)
{
t->deserializationFix();
}
// CStackInstance <-> CCreature, CStackInstance <-> CArmedInstance, CArtifactInstance <-> CArtifact
// are provided on initializing / deserializing
}
int3 CPath::startPos() const