mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r5630) Replace a boolean variable by continue

release/0.5
tron 2006-07-29 11:15:34 +00:00
parent ea51ace5f4
commit 82ebf842d1
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
viewport.c
View File

@ -1044,7 +1044,7 @@ static void ViewportSortParentSprites(ParentSpriteToDraw *psd[])
while (*++psd2 != NULL) { while (*++psd2 != NULL) {
ParentSpriteToDraw* ps2 = *psd2; ParentSpriteToDraw* ps2 = *psd2;
bool mustswap = false; ParentSpriteToDraw** psd3;
if (ps2->unk16 & 1) continue; if (ps2->unk16 & 1) continue;
@ -1054,37 +1054,37 @@ static void ViewportSortParentSprites(ParentSpriteToDraw *psd[])
if (ps->xmax > ps2->xmin && ps->xmin < ps2->xmax && // overlap in X? if (ps->xmax > ps2->xmin && ps->xmin < ps2->xmax && // overlap in X?
ps->ymax > ps2->ymin && ps->ymin < ps2->ymax && // overlap in Y? ps->ymax > ps2->ymin && ps->ymin < ps2->ymax && // overlap in Y?
ps->zmax > ps2->zmin && ps->zmin < ps2->zmax) { // overlap in Z? ps->zmax > ps2->zmin && ps->zmin < ps2->zmax) { // overlap in Z?
// Use X+Y+Z as the sorting order, so sprites nearer the bottom of the screen, /* Use X+Y+Z as the sorting order, so sprites closer to the bottom of
// and with higher Z elevation, draw in front. * the screen and with higher Z elevation, are drawn in front.
// Here X,Y,Z are the coordinates of the "center of mass" of the sprite, * Here X,Y,Z are the coordinates of the "center of mass" of the sprite,
// i.e. X=(left+right)/2, etc. * i.e. X=(left+right)/2, etc.
// However, since we only care about order, don't actually calculate the division / 2. * However, since we only care about order, don't actually divide / 2
mustswap = */
ps->xmin + ps->xmax + ps->ymin + ps->ymax + ps->zmin + ps->zmax > if (ps->xmin + ps->xmax + ps->ymin + ps->ymax + ps->zmin + ps->zmax <=
ps2->xmin + ps2->xmax + ps2->ymin + ps2->ymax + ps2->zmin + ps2->zmax; ps2->xmin + ps2->xmax + ps2->ymin + ps2->ymax + ps2->zmin + ps2->zmax) {
continue;
}
} else { } else {
// No overlap; use the original TTD sort algorithm. if (ps->xmax < ps2->xmin ||
mustswap = ps->ymax < ps2->ymin ||
ps->xmax >= ps2->xmin && ps->zmax < ps2->zmin || (
ps->ymax >= ps2->ymin && ps->xmin < ps2->xmax &&
ps->zmax >= ps2->zmin && ( ps->ymin < ps2->ymax &&
ps->xmin >= ps2->xmax || ps->zmin < ps2->zmax
ps->ymin >= ps2->ymax || )) {
ps->zmin >= ps2->zmax continue;
); }
} }
if (mustswap) {
// Swap the two sprites ps and ps2 using bubble-sort algorithm.
ParentSpriteToDraw** psd3 = psd;
do { // Swap the two sprites ps and ps2 using bubble-sort algorithm.
ParentSpriteToDraw* temp = *psd3; psd3 = psd;
*psd3 = ps2; do {
ps2 = temp; ParentSpriteToDraw* temp = *psd3;
*psd3 = ps2;
ps2 = temp;
psd3++; psd3++;
} while (psd3 <= psd2); } while (psd3 <= psd2);
}
} }
} else { } else {
psd++; psd++;