games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Partial garrison support, battles are played out and the object gets flagged.

Browse Source
This commit is contained in:
OnionKnight
2009-08-25 15:08:18 +00:00
parent a13d7fd595
commit 5f2d6b5e4c
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hch/CObjectHandler.cpp
View File

@@ -3497,6 +3497,27 @@ void CGScholar::initObj()
}
}
void CGGarrison::onHeroVisit (const CGHeroInstance *h) const
{
if (h->tempOwner != tempOwner && army) {
//TODO: Find a way to apply magic garrison effects in battle.
cb->startBattleI(h, this, false, boost::bind(&CGGarrison::fightOver, this, h, _1));
return;
}
//New owner.
if (h->tempOwner != tempOwner)
cb->setOwner(id, h->tempOwner);
//TODO: Garrison visit screen.
}
void CGGarrison::fightOver (const CGHeroInstance *h, BattleResult *result) const
{
if (result->winner == 0)
onHeroVisit(h);
}
void CGOnceVisitable::onHeroVisit( const CGHeroInstance * h ) const
{
int sound = 0;

3
hch/CObjectHandler.h
View File

@@ -602,6 +602,9 @@ class DLL_EXPORT CGGarrison : public CArmedInstance
public:
ui8 removableUnits;
void onHeroVisit (const CGHeroInstance *h) const;
void fightOver (const CGHeroInstance *h, BattleResult *result) const;
template <typename Handler> void serialize(Handler &h, const int version)
{
h & static_cast<CArmedInstance&>(*this);