1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00

* Freelancer's Guild support (both town structure and adventure map object)

* fixed crashes on r-click on hero in tavern and adv map
* fixed descync issue
* allow free movement FROM guarded tile
This commit is contained in:
Michał W. Urbańczyk
2010-05-26 09:47:53 +00:00
parent 6541e89f90
commit 8bda10b695
14 changed files with 335 additions and 104 deletions

View File

@@ -478,11 +478,15 @@ void CPlayerInterface::garrisonChanged(const CGObjectInstance * obj)
wwg->garr->recreateSlots();
wasGarrison = true;
}
else
else if(CKingdomInterface *cki = dynamic_cast<CKingdomInterface*>(*i))
{//a cheat for Kingdom Overview window (it has CWindowWithGarrison-childrens which are not present in ListInt)
CKingdomInterface *cki = dynamic_cast<CKingdomInterface*>(*i);//need to create "Garrison Holder" class thingy
if (cki)
cki->updateAllGarrisons();
//need to create "Garrison Holder" class thingy
cki->updateAllGarrisons();
}
else if(CMarketplaceWindow *cmw = dynamic_cast<CMarketplaceWindow*>(*i))
{
if(obj == cmw->hero)
cmw->garrisonChanged();
}
}
@@ -1977,6 +1981,6 @@ void CPlayerInterface::stopMovement()
void CPlayerInterface::showMarketWindow(const IMarket *market, const CGHeroInstance *visitor)
{
CMarketplaceWindow *cmw = new CMarketplaceWindow(market, market->availableModes().front());
CMarketplaceWindow *cmw = new CMarketplaceWindow(market, visitor, market->availableModes().front());
GH.pushInt(cmw);
}