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

Merge branch 'tracerestrict-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2018-08-16 05:45:30 +01:00
parent 1c41cff322 60cc1a48ac
commit f59535c0b7
7 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tracerestrict.cpp
View File

@@ -1599,15 +1599,20 @@ void TraceRestrictSlot::PreCleanPool()
}
/** Remove vehicle ID from all slot occupants */
void TraceRestrictRemoveVehicleFromAllSlots(VehicleID id)
void TraceRestrictRemoveVehicleFromAllSlots(VehicleID vehicle_id)
{
auto range = slot_vehicle_index.equal_range(id);
const auto range = slot_vehicle_index.equal_range(vehicle_id);
for (auto it = range.first; it != range.second; ++it) {
TraceRestrictSlot *slot = TraceRestrictSlot::Get(it->second);
container_unordered_remove(slot->occupants, id);
auto slot = TraceRestrictSlot::Get(it->second);
container_unordered_remove(slot->occupants, vehicle_id);
}
const bool anything_to_erase = range.first != range.second;
slot_vehicle_index.erase(range.first, range.second);
if (range.first != range.second) InvalidateWindowClassesData(WC_TRACE_RESTRICT_SLOTS);
if (anything_to_erase) InvalidateWindowClassesData(WC_TRACE_RESTRICT_SLOTS);
}
/** Replace all instance of a vehicle ID with another, in all slot occupants */