1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

- several changes to get reusable code

- possibly fixed #725
- bug in random seed initializing?
This commit is contained in:
Ivan Savenko
2011-04-30 18:16:58 +00:00
parent ec76876bda
commit e494171de3
9 changed files with 131 additions and 52 deletions

View File

@@ -474,12 +474,10 @@ void CPlayerInterface::heroInGarrisonChange(const CGTownInstance *town)
if(CCastleInterface *c = castleInt)
{
c->garr->highlighted = NULL;
c->heroSlotUp->hero = town->garrisonHero;
c->heroSlotDown->hero = town->visitingHero;
c->garr->setArmy(town->getUpperArmy(), 0);
c->garr->setArmy(town->visitingHero, 1);
c->garr->recreateSlots();
c->heroes->update();
}
GH.totalRedraw();
}
@@ -2174,8 +2172,7 @@ void CPlayerInterface::artifactRemoved(const ArtifactLocation &al)
{
if(isa->type & IShowActivable::WITH_ARTIFACTS)
{
BOOST_FOREACH(CArtifactsOfHero *aoh, (dynamic_cast<CWindowWithArtifacts*>(isa))->artSets)
aoh->artifactRemoved(al);
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactRemoved(al);
}
}
}
@@ -2187,8 +2184,7 @@ void CPlayerInterface::artifactMoved(const ArtifactLocation &src, const Artifact
{
if(isa->type & IShowActivable::WITH_ARTIFACTS)
{
BOOST_FOREACH(CArtifactsOfHero *aoh, (dynamic_cast<CWindowWithArtifacts*>(isa))->artSets)
aoh->artifactMoved(src, dst);
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactMoved(src, dst);
}
}
}
@@ -2200,8 +2196,7 @@ void CPlayerInterface::artifactAssembled(const ArtifactLocation &al)
{
if(isa->type & IShowActivable::WITH_ARTIFACTS)
{
BOOST_FOREACH(CArtifactsOfHero *aoh, (dynamic_cast<CWindowWithArtifacts*>(isa))->artSets)
aoh->artifactAssembled(al);
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactAssembled(al);
}
}
}
@@ -2213,8 +2208,7 @@ void CPlayerInterface::artifactDisassembled(const ArtifactLocation &al)
{
if(isa->type & IShowActivable::WITH_ARTIFACTS)
{
BOOST_FOREACH(CArtifactsOfHero *aoh, (dynamic_cast<CWindowWithArtifacts*>(isa))->artSets)
aoh->artifactDisassembled(al);
(dynamic_cast<CWindowWithArtifacts*>(isa))->artifactAssembled(al);
}
}
}