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

Fix large obstacles drawing in front of the stacks

Browse Source
This commit is contained in:
Vadim Markovtsev 2016-10-30 04:47:33 +01:00
parent 9651676452
commit 79c85be93f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/battle/CBattleInterface.cpp
View File

@ -3234,7 +3234,7 @@ void CBattleInterface::showBattlefieldObjects(SDL_Surface *to)
// dead stacks should be blit first
showStacks(to, objects.beforeAll.dead);
for ( auto & data : objects.hex )
for (auto & data : objects.hex)
showStacks(to, data.dead);
showStacks(to, objects.afterAll.dead);
@ -3249,8 +3249,9 @@ void CBattleInterface::showBattlefieldObjects(SDL_Surface *to)
// actual blit of most of objects, hex by hex
// NOTE: row-by-row blitting may be a better approach
for ( auto & data : objects.hex )
for (auto &data : objects.hex)
showHexEntry(data);
// objects that must be blit *after* everything else - e.g. bottom tower or some spell effects
showHexEntry(objects.afterAll);
}
@ -3479,15 +3480,19 @@ BattleObjectsByHex CBattleInterface::sortObjectsByHex()
}
// Sort obstacles
for (auto & obstacle : curInt->cb->battleGetAllObstacles())
{
if (obstacle->obstacleType != CObstacleInstance::ABSOLUTE_OBSTACLE
&& obstacle->obstacleType != CObstacleInstance::MOAT)
std::map<BattleHex, std::shared_ptr<const CObstacleInstance>> backgroundObstacles;
for (auto &obstacle : curInt->cb->battleGetAllObstacles()) {
if (obstacle->obstacleType != CObstacleInstance::ABSOLUTE_OBSTACLE
&& obstacle->obstacleType != CObstacleInstance::MOAT) {
backgroundObstacles[obstacle->pos] = obstacle;
}
}
for (auto &op : backgroundObstacles)
{
sorted.hex[obstacle->pos].obstacles.push_back(obstacle);
sorted.beforeAll.obstacles.push_back(op.second);
}
}
// Sort wall parts
if (siegeH)
{