1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-29 00:41:38 +02:00

Fixed #50, #191, minor

This commit is contained in:
Michał W. Urbańczyk
2009-11-20 22:35:18 +00:00
parent adf3c9fd4b
commit 8f217c5cdf
7 changed files with 21 additions and 31 deletions

View File

@ -2954,7 +2954,7 @@ void BattleInfo::getStackQueue( std::vector<const CStack *> &out, int howMany, i
const CStack * const s = stacks[i];
if(turn <= 0 && !s->willMove() //we are considering current round and stack won't move
|| turn > 0 && !s->canMove(turn) //stack won't be able to move in later rounds
|| turn <= 0 && s == active) //it's active stack already added at the beginning of queue
|| turn <= 0 && s == active && out.size() && s == out.front()) //it's active stack already added at the beginning of queue
{
continue;
}