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

Handle trace restrict slots when deleting or merging company

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-05-16 20:47:47 +01:00
parent ec1e848a7f
commit 3fdd553a08
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tracerestrict.cpp
View File

@@ -1574,6 +1574,7 @@ void TraceRestrictRemoveGroupID(GroupID index)
/** /**
* This is called when a company is about to be deleted or taken over * This is called when a company is about to be deleted or taken over
* Scan program pool and change any references to it to the new company ID, to avoid dangling references * Scan program pool and change any references to it to the new company ID, to avoid dangling references
* Change owner and/or delete slots
*/ */
void TraceRestrictUpdateCompanyID(CompanyID old_company, CompanyID new_company) void TraceRestrictUpdateCompanyID(CompanyID old_company, CompanyID new_company)
{ {
@@ -1591,8 +1592,20 @@ void TraceRestrictUpdateCompanyID(CompanyID old_company, CompanyID new_company)
} }
} }
TraceRestrictSlot *slot;
FOR_ALL_TRACE_RESTRICT_SLOTS(slot) {
if (slot->owner != old_company) continue;
if (new_company == INVALID_OWNER) {
TraceRestrictRemoveSlotID(slot->index);
delete slot;
} else {
slot->owner = new_company;
}
}
// update windows // update windows
InvalidateWindowClassesData(WC_TRACE_RESTRICT); InvalidateWindowClassesData(WC_TRACE_RESTRICT);
InvalidateWindowClassesData(WC_TRACE_RESTRICT_SLOTS);
} }
static std::unordered_multimap<VehicleID, TraceRestrictSlotID> slot_vehicle_index; static std::unordered_multimap<VehicleID, TraceRestrictSlotID> slot_vehicle_index;