games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Merge pull request #317 from vcmi/attackerOwned

Browse Source 
Refactored CStack::attackerOwned to CStack::side
This commit is contained in:
ArseniyShestakov
2017-07-03 16:19:54 +03:00
committed by GitHub
parent d8545d9c3b 3ce238e4d3
commit 5dfb7a5771
31 changed files with 306 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/battle/CBattleInterfaceClasses.cpp
View File

@ -384,7 +384,7 @@ CBattleResultWindow::CBattleResultWindow(const BattleResult &br, const SDL_Rect
{
auto stacks = owner.cb->battleGetAllStacks();
vstd::erase_if(stacks, [i](const CStack *stack) //erase stack of other side and not coming from garrison
{ return stack->attackerOwned == i || !stack->base; });
{ return stack->side != i || !stack->base; });
auto best = vstd::maxElementByFun(stacks, [](const CStack *stack){ return stack->type->AIValue; });
if(best != stacks.end()) //should be always but to be safe...
@ -542,7 +542,7 @@ Point CClickableHex::getXYUnitAnim(BattleHex hexNum, const CStack * stack, CBatt
//shifting position for double - hex creatures
if(stack->doubleWide())
{
if(stack->attackerOwned)
if(stack->side == BattleSide::ATTACKER)
{
if(cbi->creDir[stack->ID])
ret.x -= 44;