1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00

* fixed remaining parts of #760

* it's possible to switch active creature during tacts phase by clicking on stack
* a few minor fixes after handleHex rewrite
This commit is contained in:
Michał W. Urbańczyk
2012-04-02 23:23:14 +00:00
parent 584b761d37
commit c61f536d8b
6 changed files with 52 additions and 27 deletions

View File

@@ -705,7 +705,7 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
//initing necessary tables
bool accessibility[GameConstants::BFIELD_SIZE];
std::vector<BattleHex> accessible = gs->curB->getAccessibility(curStack, false);
std::vector<BattleHex> accessible = gs->curB->getAccessibility(curStack, false, NULL, true);
for(int b=0; b<GameConstants::BFIELD_SIZE; ++b)
{
accessibility[b] = false;
@@ -734,7 +734,7 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
return 0;
bool accessibilityWithOccupyable[GameConstants::BFIELD_SIZE];
std::vector<BattleHex> accOc = gs->curB->getAccessibility(curStack, true);
std::vector<BattleHex> accOc = gs->curB->getAccessibility(curStack, true, NULL, true);
for(int b=0; b<GameConstants::BFIELD_SIZE; ++b)
{
accessibilityWithOccupyable[b] = false;
@@ -5486,6 +5486,7 @@ void CGameHandler::runBattle()
}
else
{
tlog5 << "Activating " << next->nodeName() << std::endl;
BattleSetActiveStack sas;
sas.stack = next->ID;
sendAndApply(&sas);