Mercurial > hg > openttd
changeset 6905:bf5912475e5e draft
(svn r10154) -Fix [FS#870]: some vehicles were not drawn when having a high resolution and a high zoom-out level. Patch by B. N. SmatZ!.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Wed, 13 Jun 2007 23:43:00 +0000 |
parents | dc5287eec0a2 |
children | c67a063b99bf |
files | src/vehicle.cpp |
diffstat | 1 files changed, 23 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -889,17 +889,29 @@ const int b = dpi->top + dpi->height; /* The hash area to scan */ - const int xl = GB(l - 70, 7, 6); - const int xu = GB(r, 7, 6); - const int yl = GB(t - 70, 6, 6) << 6; - const int yu = GB(b, 6, 6) << 6; - - int x; - int y; - - for (y = yl;; y = (y + (1 << 6)) & (0x3F << 6)) { - for (x = xl;; x = (x + 1) & 0x3F) { - const Vehicle *v = _vehicle_position_hash[(x + y) & 0xFFFF]; + int xl, xu, yl, yu; + + if (dpi->width + 70 < (1 << (7 + 6))) { + xl = GB(l - 70, 7, 6); + xu = GB(r, 7, 6); + } else { + /* scan whole hash row */ + xl = 0; + xu = 0x3F; + } + + if (dpi->height + 70 < (1 << (6 + 6))) { + yl = GB(t - 70, 6, 6) << 6; + yu = GB(b, 6, 6) << 6; + } else { + /* scan whole column */ + yl = 0; + yu = 0x3F << 6; + } + + for (int y = yl;; y = (y + (1 << 6)) & (0x3F << 6)) { + for (int x = xl;; x = (x + 1) & 0x3F) { + const Vehicle *v = _vehicle_position_hash[x + y]; // already masked & 0xFFF while (v != NULL) { if (!(v->vehstatus & VS_HIDDEN) &&