games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

* more support for attacking stacks for back by two hex stacks

Browse Source 
* minor typo fixed
This commit is contained in:
mateuszb
2009-02-05 14:44:27 +00:00
parent e1d6ff54d7
commit 0070c93888
7 changed files with 78 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
CBattleInterface.cpp
View File

@ -1392,7 +1392,18 @@ void CBattleInterface::hexLclicked(int whichOne)
if(std::find(shadedHexes.begin(),shadedHexes.end(),whichOne)!=shadedHexes.end())// and it's in our range
{
CGI->curh->changeGraphic(1, 6); //cursor should be changed
giveCommand(2,whichOne,activeStack);
if(LOCPLINT->cb->battleGetStackByID(activeStack)->creature->isDoubleWide())
{
std::vector<int> acc = LOCPLINT->cb->battleGetAvailableHexes(activeStack, false);
if(vstd::contains(acc, whichOne))
giveCommand(2,whichOne,activeStack);
else
giveCommand(2,whichOne + (LOCPLINT->cb->battleGetStackByID(activeStack)->attackerOwned ? 1 : -1),activeStack);
}
else
{
giveCommand(2,whichOne,activeStack);
}
}
}
else if(dest->owner != attackingHeroInstance->tempOwner
@ -1412,7 +1423,18 @@ void CBattleInterface::hexLclicked(int whichOne)
giveCommand(6,whichOne + ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH-1 : BFIELD_WIDTH ),activeStack,whichOne);
break;
case 8:
giveCommand(6,whichOne - 1,activeStack,whichOne);
if(LOCPLINT->cb->battleGetStackByID(activeStack)->creature->isDoubleWide() && !LOCPLINT->cb->battleGetStackByID(activeStack)->attackerOwned)
{
std::vector<int> acc = LOCPLINT->cb->battleGetAvailableHexes(activeStack, false);
if(vstd::contains(acc, whichOne))
giveCommand(6,whichOne - 1,activeStack,whichOne);
else
giveCommand(6,whichOne - 2,activeStack,whichOne);
}
else
{
giveCommand(6,whichOne - 1,activeStack,whichOne);
}
break;
case 9:
giveCommand(6,whichOne - ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH+1 : BFIELD_WIDTH ),activeStack,whichOne);
@ -1421,7 +1443,18 @@ void CBattleInterface::hexLclicked(int whichOne)
giveCommand(6,whichOne - ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH : BFIELD_WIDTH-1 ),activeStack,whichOne);
break;
case 11:
giveCommand(6,whichOne + 1,activeStack,whichOne);
if(LOCPLINT->cb->battleGetStackByID(activeStack)->creature->isDoubleWide() && LOCPLINT->cb->battleGetStackByID(activeStack)->attackerOwned)
{
std::vector<int> acc = LOCPLINT->cb->battleGetAvailableHexes(activeStack, false);
if(vstd::contains(acc, whichOne))
giveCommand(6,whichOne + 1,activeStack,whichOne);
else
giveCommand(6,whichOne + 2,activeStack,whichOne);
}
else
{
giveCommand(6,whichOne + 1,activeStack,whichOne);
}
break;
}
CGI->curh->changeGraphic(1, 6); //cursor should be changed
@ -1974,7 +2007,7 @@ void CBattleInterface::attackingShowHelper()
void CBattleInterface::redrawBackgroundWithHexes(int activeStack)
{
shadedHexes = LOCPLINT->cb->battleGetAvailableHexes(activeStack);
shadedHexes = LOCPLINT->cb->battleGetAvailableHexes(activeStack, true);
//preparating background graphic with hexes and shaded hexes
blitAt(background, 0, 0, backgroundWithHexes);