mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix c38df2d58: Use VehicleID instead of pointer in map of vehicles to replace. (#12512) 

This affects the sort order, VehicleID is deterministic, Vehicle * is not.
This commit is contained in:
Peter Nelson 2024-04-17 18:54:50 +01:00 committed by GitHub
parent b477a8458c
commit ef8eb66a2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vehicle.cpp
View File

@ -691,7 +691,7 @@ void ResetVehicleColourMap()
* List of vehicles that should check for autoreplace this tick. * List of vehicles that should check for autoreplace this tick.
* Mapping of vehicle -> leave depot immediately after autoreplace. * Mapping of vehicle -> leave depot immediately after autoreplace.
*/ */
using AutoreplaceMap = std::map<Vehicle *, bool>; using AutoreplaceMap = std::map<VehicleID, bool>;
static AutoreplaceMap _vehicles_to_autoreplace; static AutoreplaceMap _vehicles_to_autoreplace;
void InitializeVehicles() void InitializeVehicles()
@ -921,7 +921,7 @@ Vehicle::~Vehicle()
void VehicleEnteredDepotThisTick(Vehicle *v) void VehicleEnteredDepotThisTick(Vehicle *v)
{ {
/* Vehicle should stop in the depot if it was in 'stopping' state */ /* Vehicle should stop in the depot if it was in 'stopping' state */
_vehicles_to_autoreplace[v] = !(v->vehstatus & VS_STOPPED); _vehicles_to_autoreplace[v->index] = !(v->vehstatus & VS_STOPPED);
/* We ALWAYS set the stopped state. Even when the vehicle does not plan on /* We ALWAYS set the stopped state. Even when the vehicle does not plan on
* stopping in the depot, so we stop it to ensure that it will not reserve * stopping in the depot, so we stop it to ensure that it will not reserve
@ -1069,7 +1069,7 @@ void CallVehicleTicks()
Backup<CompanyID> cur_company(_current_company); Backup<CompanyID> cur_company(_current_company);
for (auto &it : _vehicles_to_autoreplace) { for (auto &it : _vehicles_to_autoreplace) {
Vehicle *v = it.first; Vehicle *v = Vehicle::Get(it.first);
/* Autoreplace needs the current company set as the vehicle owner */ /* Autoreplace needs the current company set as the vehicle owner */
cur_company.Change(v->owner); cur_company.Change(v->owner);
@ -1625,7 +1625,7 @@ void VehicleEnterDepot(Vehicle *v)
cur_company.Restore(); cur_company.Restore();
if (cost.Failed()) { if (cost.Failed()) {
_vehicles_to_autoreplace[v] = false; _vehicles_to_autoreplace[v->index] = false;
if (v->owner == _local_company) { if (v->owner == _local_company) {
/* Notify the user that we stopped the vehicle */ /* Notify the user that we stopped the vehicle */
SetDParam(0, v->index); SetDParam(0, v->index);
@ -1647,7 +1647,7 @@ void VehicleEnterDepot(Vehicle *v)
} }
if (v->current_order.GetDepotActionType() & ODATFB_HALT) { if (v->current_order.GetDepotActionType() & ODATFB_HALT) {
/* Vehicles are always stopped on entering depots. Do not restart this one. */ /* Vehicles are always stopped on entering depots. Do not restart this one. */
_vehicles_to_autoreplace[v] = false; _vehicles_to_autoreplace[v->index] = false;
/* Invalidate last_loading_station. As the link from the station /* Invalidate last_loading_station. As the link from the station
* before the stop to the station after the stop can't be predicted * before the stop to the station after the stop can't be predicted
* we shouldn't construct it when the vehicle visits the next stop. */ * we shouldn't construct it when the vehicle visits the next stop. */