dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude effect and disaster vehicles from vehicle tile hash

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-02-28 18:52:02 +00:00
parent 1d79a7610d
commit 4020719227
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vehicle.cpp
View File

@@ -760,7 +760,7 @@ CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits)
return CommandCost();
}
static void UpdateVehicleTileHash(Vehicle *v, bool remove)
void UpdateVehicleTileHash(Vehicle *v, bool remove)
{
Vehicle **old_hash = v->hash_tile_current;
Vehicle **new_hash;
@@ -1078,7 +1078,7 @@ Vehicle::~Vehicle()
delete v;
UpdateVehicleTileHash(this, true);
if (this->type < VEH_COMPANY_END) UpdateVehicleTileHash(this, true);
UpdateVehicleViewportHash(this, INVALID_COORD, 0);
DeleteVehicleNews(this->index, INVALID_STRING_ID);
DeleteNewGRFInspectWindow(GetGrfSpecFeature(this->type), this->index);
@@ -2330,16 +2330,6 @@ void VehicleEnterDepot(Vehicle *v)
}
}
/**
* Update the position of the vehicle. This will update the hash that tells
* which vehicles are on a tile.
*/
void Vehicle::UpdatePosition()
{
UpdateVehicleTileHash(this, false);
}
/**
* Update the vehicle on the viewport, updating the right hash and setting the
* new coordinates.