dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2018-11-19 20:51:16 +00:00
parent df0aa2ed4b 476643bfa5
commit c1df63a2eb
56 changed files with 150 additions and 20323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/viewport.cpp
View File

@@ -105,7 +105,6 @@
#include "gui.h"
#include "core/container_func.hpp"
#include "tunnelbridge_map.h"
#include "core/sort_func.hpp"
#include <map>
#include <vector>
@@ -1526,22 +1525,11 @@ static bool ViewportSortParentSpritesChecker()
return true;
}
static int CDECL CompareParentSprites(ParentSpriteToDraw * const *psd, ParentSpriteToDraw * const *psd2)
{
const ParentSpriteToDraw *ps = *psd;
const ParentSpriteToDraw *ps2 = *psd2;
return ps->xmin - ps2->xmin;
}
/** Sort parent sprites pointer array */
static void ViewportSortParentSprites(ParentSpriteToSortVector *psdv)
{
ParentSpriteToDraw **psdvend = psdv->End();
ParentSpriteToDraw **psd = psdv->Begin();
/* pre-sort by xmin in ascending order */
QSortT(psd, psdvend - psd, CompareParentSprites);
while (psd != psdvend) {
ParentSpriteToDraw *ps = *psd;
@@ -1578,11 +1566,9 @@ static void ViewportSortParentSprites(ParentSpriteToSortVector *psdv)
* I.e. every single order of X, Y, Z says ps2 is behind ps or they overlap.
* That is: If one partial order says ps behind ps2, do not change the order.
*/
if (ps->xmax < ps2->xmin) {
/* all following sprites have xmin >= ps2->xmin */
break;
}
if (ps->ymax < ps2->ymin || ps->zmax < ps2->zmin) {
if (ps->xmax < ps2->xmin ||
ps->ymax < ps2->ymin ||
ps->zmax < ps2->zmin) {
continue;
}
}