cpp/openttd-patchpack/source Changeset - r18474:ad09c947a79c

Changeset - r18474:ad09c947a79c

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 13 years ago 2011-11-25 23:02:39
peter1138@openttd.org

(svn r23328) -Change: Make the viewport vehicle position hash cover the same area.

1 file changed with 7 insertions and 7 deletions:

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -53,13 +53,13 @@ @@
 #include "tunnel_map.h"
 #include "depot_map.h"
 #include "gamelog.h"
 #include "table/strings.h"
 #define GEN_HASH(x, y) ((GB((y), 6, 6) << 6) + GB((x), 7, 6))
+#define GEN_HASH(x, y) ((GB((y), 6 + ZOOM_LVL_SHIFT, 6) << 6) + GB((x), 7 + ZOOM_LVL_SHIFT, 6))
 VehicleID _new_vehicle_id;
 uint16 _returned_refit_capacity;      ///< Stores the capacity after a refit operation.
 uint16 _returned_mail_refit_capacity; ///< Stores the mail capacity after a refit operation (Aircraft only).
@@ @@ -977,24 +977,24 @@ void ViewportAddVehicles(DrawPixelInfo * @@
 	const int t = dpi->top;
 	const int b = dpi->top + dpi->height;
 	/* The hash area to scan */
 	int xl, xu, yl, yu;
 	if (dpi->width + (70 * ZOOM_LVL_BASE) < (1 << (7 + 6))) {
 		xl = GB(l - (70 * ZOOM_LVL_BASE), 7, 6);
 		xu = GB(r,      7, 6);
 	if (dpi->width + (70 * ZOOM_LVL_BASE) < (1 << (7 + 6 + ZOOM_LVL_SHIFT))) {
 		xl = GB(l - (70 * ZOOM_LVL_BASE), 7 + ZOOM_LVL_SHIFT, 6);
 		xu = GB(r,                        7 + ZOOM_LVL_SHIFT, 6);
 	} else {
 		/* scan whole hash row */
 		xl = 0;
 		xu = 0x3F;
+	}
 	if (dpi->height + (70 * ZOOM_LVL_BASE) < (1 << (6 + 6))) {
 		yl = GB(t - (70 * ZOOM_LVL_BASE), 6, 6) << 6;
 		yu = GB(b,      6, 6) << 6;
 	if (dpi->height + (70 * ZOOM_LVL_BASE) < (1 << (6 + 6 + ZOOM_LVL_SHIFT))) {
 		yl = GB(t - (70 * ZOOM_LVL_BASE), 6 + ZOOM_LVL_SHIFT, 6) << 6;
 		yu = GB(b,                        6 + ZOOM_LVL_SHIFT, 6) << 6;
 	} else {
 		/* scan whole column */
 		yl = 0;
 		yu = 0x3F << 6;
+	}

0 comments (0 inline, 0 general)