diff options
author | peter1138 <peter1138@openttd.org> | 2007-07-30 08:49:41 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2007-07-30 08:49:41 +0000 |
commit | 92061aba4ea4cb190ae94d98a2ecc1df52f90d45 (patch) | |
tree | 3a919447e032e1fc18a1e2e780c0d9f53dec26d5 /src/vehicle.cpp | |
parent | 7fb3f54584fd9dd3266997cd12bd1853c18ad5bb (diff) | |
download | openttd-92061aba4ea4cb190ae94d98a2ecc1df52f90d45.tar.xz |
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
Diffstat (limited to 'src/vehicle.cpp')
-rw-r--r-- | src/vehicle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 2d2b865fa..7c3c5a4db 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -471,8 +471,8 @@ static void UpdateNewVehiclePosHash(Vehicle *v, bool remove) if (remove) { new_hash = NULL; } else { - 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; + int x = GB(TileX(v->tile), HASH_RES, HASH_BITS); + int y = GB(TileY(v->tile), HASH_RES, HASH_BITS) << HASH_BITS; new_hash = &_new_vehicle_position_hash[(x + y) & TOTAL_HASH_MASK]; } |