1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00

Merged fixes from the branch.

This commit is contained in:
Michał W. Urbańczyk
2013-09-28 00:58:33 +00:00
20 changed files with 167 additions and 61 deletions

View File

@ -153,7 +153,7 @@ CBattleInterface::CBattleInterface(const CCreatureSet * army1, const CCreatureSe
//initializing armies
this->army1 = army1;
this->army2 = army2;
std::vector<const CStack*> stacks = curInt->cb->battleGetAllStacks();
std::vector<const CStack*> stacks = curInt->cb->battleGetAllStacks(true);
for(const CStack *s : stacks)
{
newStack(s);
@ -3652,7 +3652,7 @@ void CBattleInterface::showPiecesOfWall(SDL_Surface * to, std::vector<int> piece
const CStack *turret = nullptr;
for(auto & stack : curInt->cb->battleGetAllStacks())
for(auto & stack : curInt->cb->battleGetAllStacks(true))
{
if(stack->position == stackPos)
{