@@ -450,50 +450,50 @@ void *VehicleFromPosXY(int x, int y, voi
void *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc)
{
int x = GB(TileX(tile), HASH_RES, HASH_BITS);
int y = GB(TileY(tile), HASH_RES, HASH_BITS) << HASH_BITS;
Vehicle *v = _new_vehicle_position_hash[(x + y) & TOTAL_HASH_MASK];
for (; v != NULL; v = v->next_new_hash) {
if (v->tile != tile) continue;
void *a = proc(v, data);
if (a != NULL) return a;
}
return NULL;
static void UpdateNewVehiclePosHash(Vehicle *v, bool remove)
Vehicle **old_hash = v->old_new_hash;
Vehicle **new_hash;
if (remove) {
new_hash = NULL;
} else {
int x = GB(TileX(v->tile), HASH_RES, HASH_BITS);
int y = GB(TileY(v->tile), HASH_RES, HASH_BITS) << HASH_BITS;
int x = GB(v->x_pos / TILE_SIZE, HASH_RES, HASH_BITS);
int y = GB(v->y_pos / TILE_SIZE, HASH_RES, HASH_BITS) << HASH_BITS;
new_hash = &_new_vehicle_position_hash[(x + y) & TOTAL_HASH_MASK];
if (old_hash == new_hash) return;
/* Remove from the old position in the hash table */
if (old_hash != NULL) {
Vehicle *last = NULL;
Vehicle *u = *old_hash;
while (u != v) {
last = u;
u = u->next_new_hash;
assert(u != NULL);
if (last == NULL) {
*old_hash = v->next_new_hash;
last->next_new_hash = v->next_new_hash;
/* Insert vehicle at beginning of the new position in the hash table */
if (new_hash != NULL) {
Status change: