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

(svn r7047) -Fix [FS#317]: Zooming out near map-borders would previously fail because the new centre 

would be outside the map. Change behaviour so that a reasonable approximation is
 returned so that zooming (out) still works (GrimRC)
release/0.5
Darkvater 2006-11-03 00:48:03 +00:00
parent 7977bd51a4
commit a9fa6fd506
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
viewport.c
View File

@ -297,6 +297,7 @@ static Point TranslateXYToTileCoord(const ViewPort *vp, int x, int y)
{ {
Point pt; Point pt;
int a,b; int a,b;
uint z;
if ( (uint)(x -= vp->left) >= (uint)vp->width || if ( (uint)(x -= vp->left) >= (uint)vp->width ||
(uint)(y -= vp->top) >= (uint)vp->height) { (uint)(y -= vp->top) >= (uint)vp->height) {
@ -315,20 +316,20 @@ static Point TranslateXYToTileCoord(const ViewPort *vp, int x, int y)
b = x-y; b = x-y;
#endif #endif
if ((uint)a < MapMaxX() * TILE_SIZE && (uint)b < MapMaxY() * TILE_SIZE) { /* we need to move variables in to the valid range, as the
uint z; * GetTileZoomCenterWindow() function can call here with invalid x and/or y,
* when the user tries to zoom out along the sides of the map */
a = clamp(a, 0, (int)(MapMaxX() * TILE_SIZE) - 1);
b = clamp(b, 0, (int)(MapMaxY() * TILE_SIZE) - 1);
z = GetSlopeZ(a, b ) / 2; z = GetSlopeZ(a, b ) / 2;
z = GetSlopeZ(a + z, b + z) / 2; z = GetSlopeZ(a + z, b + z) / 2;
z = GetSlopeZ(a + z, b + z) / 2; z = GetSlopeZ(a + z, b + z) / 2;
z = GetSlopeZ(a + z, b + z) / 2; z = GetSlopeZ(a + z, b + z) / 2;
z = GetSlopeZ(a + z, b + z) / 2; z = GetSlopeZ(a + z, b + z) / 2;
pt.x = a + z; pt.x = a + z;
pt.y = b + z; pt.y = b + z;
} else {
pt.x = pt.y = -1;
}
return pt; return pt;
} }