games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Map objects order should be close to H3

Browse Source
This commit is contained in:
Ivan Savenko 2023-02-21 16:45:05 +02:00
parent 7df5c612f7
commit cd5f0bb36f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/mapRenderer/mapHandler.cpp
View File

@ -138,8 +138,15 @@ bool CMapHandler::compareObjectBlitOrder(const CGObjectInstance * a, const CGObj
return true; return true;
if (!b) if (!b)
return false; return false;
if (a->appearance->printPriority != b->appearance->printPriority)
return a->appearance->printPriority > b->appearance->printPriority; if (a->appearance->printPriority != 0 || b->appearance->printPriority != 0)
{
if (a->appearance->printPriority != b->appearance->printPriority)
return a->appearance->printPriority > b->appearance->printPriority;
//H3 behavior: order of two background objects depends on their placement order on map
return a->id < b->id;
}
if(a->pos.y != b->pos.y) if(a->pos.y != b->pos.y)
return a->pos.y < b->pos.y; return a->pos.y < b->pos.y;
@ -153,9 +160,10 @@ bool CMapHandler::compareObjectBlitOrder(const CGObjectInstance * a, const CGObj
return true; return true;
if(!b->isVisitable() && a->isVisitable()) if(!b->isVisitable() && a->isVisitable())
return false; return false;
if(a->pos.x < b->pos.x)
return true; //H3 behavior: order of two background objects depends on their placement order on map
return false; return a->id < b->id;
} }
CMapHandler::CMapHandler(const CMap * map) CMapHandler::CMapHandler(const CMap * map)