1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
This commit is contained in:
mateuszb 2010-07-28 12:54:45 +00:00
parent b15e8531b2
commit 67f9d6d630

View File

@ -1363,7 +1363,8 @@ void CGameHandler::setupBattle(BattleInfo * curB, int3 tile, const CArmedInstanc
} }
if(hero2) if(hero2)
{ {
if(hero2->getArt(13)) //ballista //defending hero shouldn't receive ballista (bug #551)
if(hero2->getArt(13) && !town) //ballista
{ {
CStack * stack = curB->generateNewStack(CStackInstance(146, 1, hero2), stacks.size(), false, 255, gs->map->terrain[tile.x][tile.y][tile.z].tertype, 66); CStack * stack = curB->generateNewStack(CStackInstance(146, 1, hero2), stacks.size(), false, 255, gs->map->terrain[tile.x][tile.y][tile.z].tertype, 66);
stacks.push_back(stack); stacks.push_back(stack);