From f3145030b731bef915acad1bcfbf20c78d4adf80 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 9 Mar 2020 09:22:51 +0000 Subject: [PATCH] Fix false positive in ValidateVehicleTileHash --- src/vehicle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 878a29bea7..1da1006c62 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -735,7 +735,7 @@ void UpdateVehicleTileHash(Vehicle *v, bool remove) bool ValidateVehicleTileHash(const Vehicle *v) { - if (v->type == VEH_TRAIN && Train::From(v)->IsVirtual()) return v->hash_tile_current == nullptr; + if ((v->type == VEH_TRAIN && Train::From(v)->IsVirtual()) || v->type >= VEH_COMPANY_END) return v->hash_tile_current == nullptr; int x = GB(TileX(v->tile), HASH_RES, HASH_BITS); int y = GB(TileY(v->tile), HASH_RES, HASH_BITS) << HASH_BITS;