miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Move ownership of Orders to OrderList. (#13948)

Browse Source 
Removes the orders pool, and orders are now stored directly in each OrderList.

Iterating orders now no longer needs to traverse a linked-list, all orders in an OrderList are sequential.
This commit is contained in:
Peter Nelson
2025-05-23 10:36:28 +01:00
committed by GitHub
parent 7344dfe651
commit 0455627d16
30 changed files with 602 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/saveload/waypoint_sl.cpp
+6 -6
View File
@@ -49,14 +49,14 @@ static std::vector<OldWaypoint> _old_waypoints;
* Update the waypoint orders to get the new waypoint ID.
* @param o the order 'list' to check.
*/
static void UpdateWaypointOrder(Order *o)
static void UpdateWaypointOrder(Order &o)
{
if (!o->IsType(OT_GOTO_WAYPOINT)) return;
if (!o.IsType(OT_GOTO_WAYPOINT)) return;
for (OldWaypoint &wp : _old_waypoints) {
if (wp.index != o->GetDestination()) continue;
if (wp.index != o.GetDestination()) continue;
o->SetDestination(wp.new_index);
o.SetDestination(wp.new_index);
return;
}
}
@@ -147,13 +147,13 @@ void MoveWaypointsToBaseStations()
for (OrderList *ol : OrderList::Iterate()) {
if (ol->GetFirstSharedVehicle()->type != VEH_TRAIN) continue;
for (Order *o = ol->GetFirstOrder(); o != nullptr; o = o->next) UpdateWaypointOrder(o);
for (Order &o : ol->GetOrders()) UpdateWaypointOrder(o);
}
for (Vehicle *v : Vehicle::Iterate()) {
if (v->type != VEH_TRAIN) continue;
UpdateWaypointOrder(&v->current_order);
UpdateWaypointOrder(v->current_order);
}
ResetOldWaypoints();