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

Fixed #543 and #547. Fixes for marketplace. Combined artifacts will again give bonuses from their constituents.

This commit is contained in:
Michał W. Urbańczyk
2010-07-26 15:37:58 +00:00
parent a00e5cc177
commit dc936d5686
9 changed files with 52 additions and 20 deletions

View File

@@ -1797,6 +1797,7 @@ void CAdvMapInt::tileLClicked(const int3 &mp)
LOCPLINT->openTownWindow(static_cast<const CGTownInstance*>(topBlocking));
else if(topBlocking && (topBlocking->ID == TOWNI_TYPE || topBlocking->ID == HEROI_TYPE) && topBlocking->tempOwner == LOCPLINT->playerID) //our town/hero clicked
select(static_cast<const CArmedInstance*>(topBlocking), false);
return;
}
else if(const CGHeroInstance * currentHero = curHero()) //hero is selected
{