games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Style tweaks

Browse Source
This commit is contained in:
AlexVinS
2015-04-12 09:26:50 +03:00
parent 9eaa136c58
commit f5c2e6d5e1
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/CGameHandler.cpp
View File

@@ -1020,11 +1020,9 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
} }
else //for non-flying creatures else //for non-flying creatures
{ {
// send one package with the creature path information
shared_ptr<const CObstacleInstance> obstacle, obstacle2; //obstacle that interrupted movement shared_ptr<const CObstacleInstance> obstacle, obstacle2; //obstacle that interrupted movement
std::vector<BattleHex> tiles; std::vector<BattleHex> tiles;
int tilesToMove = std::max((int)(path.first.size() - creSpeed), 0); const int tilesToMove = std::max((int)(path.first.size() - creSpeed), 0);
int v = path.first.size()-1; int v = path.first.size()-1;
bool stackIsMoving = true; bool stackIsMoving = true;
@@ -1036,27 +1034,23 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
logGlobal->error("Movement terminated abnormally"); logGlobal->error("Movement terminated abnormally");
break; break;
} }
for(bool stop = false; (!stop) && (v >= tilesToMove); --v)
for(bool obstacleHit = false; (!obstacleHit) && (v >= tilesToMove); --v)
{ {
BattleHex hex = path.first[v]; BattleHex hex = path.first[v];
tiles.push_back(hex); tiles.push_back(hex);
//if we walked onto something, finalize this portion of stack movement check into obstacle
if((obstacle = battleGetObstacleOnPos(hex, false))) if((obstacle = battleGetObstacleOnPos(hex, false)))
{ obstacleHit = true;
//we walked onto something, so we finalize this portion of stack movement check into obstacle
stop = true;
}
if(curStack->doubleWide()) if(curStack->doubleWide())
{ {
BattleHex otherHex = curStack->occupiedHex(hex); BattleHex otherHex = curStack->occupiedHex(hex);
//two hex creature hit obstacle by backside
if(otherHex.isValid() && ((obstacle2 = battleGetObstacleOnPos(otherHex, false)))) if(otherHex.isValid() && ((obstacle2 = battleGetObstacleOnPos(otherHex, false))))
{ obstacleHit = true;
//two hex creature hit obstacle by backside
stop = true;
}
} }
} }
@@ -1081,12 +1075,10 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
{ {
handleDamageFromObstacle(*obs, curStack); handleDamageFromObstacle(*obs, curStack);
//if stack didn't die in explosion, continue movement //if stack die in explosion or interrupted by obstacle, abort movement
if(obs->stopsMovement() || !curStack->alive()) if(obs->stopsMovement() || !curStack->alive())
{
//movement has been interrupted by obstacle
stackIsMoving = false; stackIsMoving = false;
}
obs.reset(); obs.reset();
} }
}; };
@@ -1096,7 +1088,7 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
processObstacle(obstacle2); processObstacle(obstacle2);
} }
else else
//movement finished normally //movement finished normally: we reached destination
stackIsMoving = false; stackIsMoving = false;
} }
} }