summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-09-14 21:36:59 +0000
committerrubidium <rubidium@openttd.org>2007-09-14 21:36:59 +0000
commitf68051d19b2e79ecaf64e3fd7cbdb22011e3a642 (patch)
tree4cb158ec2b460b3b96cde83dc31d9994bc4837a3 /src
parentb62d995ce885349b7c283cb70f70bb978279c4a2 (diff)
downloadopenttd-f68051d19b2e79ecaf64e3fd7cbdb22011e3a642.tar.xz
(svn r11104) -Fix: bounding boxes also overlap when the min of a bounding box is equal to the max of another bounding box. Patch by frosch.
Diffstat (limited to 'src')
-rw-r--r--src/viewport.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 5880c445f..a40ba6392 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1147,9 +1147,9 @@ static void ViewportSortParentSprites(ParentSpriteToDraw *psd[])
/* Decide which comparator to use, based on whether the bounding
* boxes overlap
*/
- if (ps->xmax > ps2->xmin && ps->xmin < ps2->xmax && // overlap in X?
- ps->ymax > ps2->ymin && ps->ymin < ps2->ymax && // overlap in Y?
- ps->zmax > ps2->zmin && ps->zmin < ps2->zmax) { // overlap in Z?
+ if (ps->xmax >= ps2->xmin && ps->xmin <= ps2->xmax && // overlap in X?
+ ps->ymax >= ps2->ymin && ps->ymin <= ps2->ymax && // overlap in Y?
+ ps->zmax >= ps2->zmin && ps->zmin <= ps2->zmax) { // overlap in Z?
/* Use X+Y+Z as the sorting order, so sprites closer to the bottom of
* 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,